dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Small UI adjustments for better text fitting

Browse source 
When running 0ad with a language other than English, there are various
places where text doesn't properly fit. This adjusts the UI in a bunch
of these places to better accommodate longer strings as they appear in
other languages than English and to make the UI look more uniform in
general.
This commit is contained in:
Dunedan 2024-12-28 08:51:12 +01:00
parent 099a718e62
commit fc7e4ae69e
No known key found for this signature in database
GPG key ID: 885B16854284E0B2
25 changed files with 159 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
binaries/data/mods/mod/gui/modmod/modmod.xml
View file

@ -13,7 +13,7 @@
</object>
<!-- Filter Panel -->
<object size="0 40 312 64">
<object size="0 40 350 64">
<object name="modGenericFilter"
type="input"
style="ModernInput"
@ -38,7 +38,7 @@
</object>
</object>
<object size = "100%-200 40 100%-20 64">
<object size = "100%-275 40 100%-20 64">
<object name="modCompatibleFilter"
type="checkbox"
checked="false"
@ -55,7 +55,7 @@
<object
name="globalModDescription"
type="text"
size="312 32 100%-16 69"
size="350 32 100%-16 69"
textcolor="180 180 180"
text_align="left"
text_valign="center"

6
binaries/data/mods/public/gui/common/functions_utility.js
View file

@ -241,6 +241,12 @@ function resizeGUIObjectToCaption(object, align, margin = {})
case "left":
objectSize.left = object.size.right - width;
break;
case "center":
const oldWidth = object.size.right - object.size.left;
const widthDiff = width - oldWidth;
objectSize.right = object.size.right + (widthDiff / 2);
objectSize.left = object.size.left - (widthDiff / 2);
break;
default:
}
}

8
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatInputPanel.js
View file

@ -4,6 +4,14 @@ class ChatInputPanel
{
this.chatInputAutocomplete = chatInputAutocomplete;
this.chatSubmitButton = Engine.GetGUIObjectByName("chatSubmitButton");
resizeGUIObjectToCaption(this.chatSubmitButton, { "horizontal": "left" }, { "horizontal": 8 });
this.chatInput = Engine.GetGUIObjectByName("chatInput");
let size = this.chatInput.size;
size.right = this.chatSubmitButton.size.left;
this.chatInput.size = size;
this.chatInput = Engine.GetGUIObjectByName("chatInput");
this.chatInput.tooltip = colorizeAutocompleteHotkey(this.Tooltip);
this.chatInput.onPress = this.onPress.bind(this);

2
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatPanel.xml
View file

@ -3,7 +3,7 @@
<object name="chatText" type="list" size="2 2 100%-2 100%-28" style="ChatPanelList"/>
<object name="chatInput" type="input" size="4 100%-26 100%-96 100%-4" style="ModernInput" max_length="1024"/>
<object name="chatInput" type="input" size="0 100%-26 100%-96 100%-4" style="ModernInput" max_length="1024"/>
<object name="chatSubmitButton" size="100%-92 100%-26 100%-4 100%-4" type="button" style="StoneButton">
<translatableAttribute id="caption">Send</translatableAttribute>

1
binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Tooltip.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<object name="onscreenToolTip"
type="text"
text_valign="center"
font="sans-14"
textcolor="white"
sprite="BackgroundTranslucent"

4
binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
View file

@ -116,8 +116,8 @@
</object>
</object>
<object name="hostSTUNWrapper" size="120 136 100% 180">
<object name="useSTUN" size="0 10 32 100%" type="checkbox" style="ModernTickBox">
<object name="hostSTUNWrapper" size="80 152 100%-20 180">
<object name="useSTUN" size="0 4 32 100%" type="checkbox" style="ModernTickBox">
<action on="Press">Engine.ConfigDB_CreateAndSaveValue("user", "lobby.stun.enabled", String(this.checked));</action>
</object>
<object type="text" size="26 0 100% 100%" style="ModernLeftLabelText">

2
binaries/data/mods/public/gui/hotkeys/hotkeys.xml
View file

@ -18,7 +18,7 @@
<translatableAttribute id="caption">Category:</translatableAttribute>
</object>
<object name="hotkeyFilter" type="dropdown" style="ModernDropDown" size="132 32 300 58"/>
<object name="hotkeyFilter" type="dropdown" style="ModernDropDown" size="132 32 350 58"/>
<object style="ModernLabelText" type="text" size="100%-300 32 100%-200 58" text_align="left">
<translatableAttribute id="caption">Filter:</translatableAttribute>

62
binaries/data/mods/public/gui/loadgame/load.xml
View file

@ -19,85 +19,85 @@
selected_column="date"
selected_column_order="-1"
sortable="true"
size="24 4 100%-24 100%-72"
size="20 4 100%-20 100%-72"
type="olist"
auto_scroll="true"
>
<column id="date" textcolor="255 255 255" width="25%">
<column id="date" textcolor="255 255 255" width="24%">
<translatableAttribute id="heading" context="replay">Date / Time</translatableAttribute>
</column>
<column id="mapType" textcolor="255 255 255" width="15%">
<column id="mapType" textcolor="255 255 255" width="21%">
<translatableAttribute id="heading" context="replay">Map Type</translatableAttribute>
</column>
<column id="mapName" textcolor="255 255 255" width="35%">
<column id="mapName" textcolor="255 255 255" width="33%">
<translatableAttribute id="heading" context="replay">Map Name</translatableAttribute>
</column>
<column id="description" textcolor="255 255 255" width="25%">
<column id="description" textcolor="255 255 255" width="22%">
<translatableAttribute id="heading" context="replay">Description</translatableAttribute>
</column>
</object>
<object name="gameSelectionFeedback" size="24 12 100%-24 100" type="text" style="ModernLabelText" hidden="true">
<object name="gameSelectionFeedback" size="20 12 100%-20 100" type="text" style="ModernLabelText" hidden="true">
<translatableAttribute id="caption">No saved games found.</translatableAttribute>
</object>
<object name="saveGameDesc" size="24 100%-96 100%-24 100%-72" type="input" style="ModernInput" hidden="true"/>
<object name="saveGameDesc" size="20 100%-96 100%-20 100%-72" type="input" style="ModernInput" hidden="true"/>
<object name="cancel" type="button" size="0%+25 100%-60 33%+10 100%-32" style="StoneButton" hotkey="cancel">
<object name="cancel" type="button" size="0%+20 100%-60 33%+10 100%-32" style="StoneButton" hotkey="cancel">
<translatableAttribute id="caption">Cancel</translatableAttribute>
</object>
<object name="deleteGameButton" type="button" size="33%+20 100%-60 66%-15 100%-32" style="StoneButton" enabled="false" hotkey="session.savedgames.delete">
<object name="deleteGameButton" type="button" size="33%+20 100%-60 66%-20 100%-32" style="StoneButton" enabled="false" hotkey="session.savedgames.delete">
<translatableAttribute id="caption">Delete</translatableAttribute>
</object>
<object name="confirmButton" type="button" style="StoneButton" size="66%-5 100%-60 100%-25 100%-32"/>
<object name="confirmButton" type="button" style="StoneButton" size="66%-10 100%-60 100%-20 100%-32"/>
</object>
<object name="filterPanel" size="630 25 100%-20 60">
<object name="filterPanel" size="625 25 100%-20 70">
<object name="compatibilityFilter" type="checkbox" checked="true" style="ModernTickBox" size="0 0 20 20"/>
<object type="text" size="25 0 100% 100%" text_align="left" textcolor="white">
<object type="text" size="20 0 100% 100%" text_align="left" textcolor="white">
<translatableAttribute id="caption">Filter compatible saved games</translatableAttribute>
</object>
</object>
<object name="validGame" type="image" size="630 60 100%-20 100%">
<object size="0 0 100%-15 1" type="image" sprite="ModernWhiteLine" z="25" />
<object name="savedMapName" size="0 0 100% 20" type="text" style="ModernLabelText" />
<object name="savedInfoPreview" size="0 30 260 218" type="image" />
<object name="validGame" type="image" size="625 75 100%-20 100%">
<object size="0 0 100% 1" type="image" sprite="ModernWhiteLine" z="25" />
<object name="savedMapName" size="0 2 100% 22" type="text" style="ModernLabelText" />
<object name="savedInfoPreview" size="0 30 100% 218" type="image" />
<object size="0 250 50% 270" type="text" style="ModernLeftLabelText">
<object size="0 218 50% 246" type="text" style="ModernLeftLabelText">
<translatableAttribute id="caption">Players:</translatableAttribute>
</object>
<object name="savedPlayers" size="50% 250 100%-15 270" type="text" style="ModernLeftLabelText" />
<object size="0 270 50% 290" type="text" style="ModernLeftLabelText">
<object name="savedPlayers" size="51% 218 100% 246" type="text" style="ModernLeftLabelText" />
<object size="0 246 50% 274" type="text" style="ModernLeftLabelText">
<translatableAttribute id="caption">Played time:</translatableAttribute>
</object>
<object name="savedPlayedTime" size="50% 270 100%-15 290" type="text" style="ModernLeftLabelText" />
<object size="0 290 50% 310" type="text" style="ModernLeftLabelText">
<object name="savedPlayedTime" size="51% 246 100% 274" type="text" style="ModernLeftLabelText" />
<object size="0 274 50% 302" type="text" style="ModernLeftLabelText">
<translatableAttribute id="caption">Map Type:</translatableAttribute>
</object>
<object name="savedMapType" size="50% 290 100%-15 310" type="text" style="ModernLeftLabelText" />
<object size="0 310 50% 330" type="text" style="ModernLeftLabelText">
<object name="savedMapType" size="51% 274 100% 302" type="text" style="ModernLeftLabelText" />
<object size="0 302 50% 330" type="text" style="ModernLeftLabelText">
<translatableAttribute id="caption">Map Size:</translatableAttribute>
</object>
<object name="savedMapSize" size="50% 310 100%-15 330" type="text" style="ModernLeftLabelText" />
<object size="0 330 50% 370" type="text" style="ModernLeftLabelText">
<object name="savedMapSize" size="51% 302 100% 330" type="text" style="ModernLeftLabelText" />
<object size="0 330 50% 358" type="text" style="ModernLeftLabelText">
<translatableAttribute id="caption">Victory:</translatableAttribute>
</object>
<object name="savedVictory" size="50% 330 100%-15 370" type="text" style="ModernText" font="sans-bold-stroke-14" />
<object name="savedVictory" size="51% 330 100% 358" type="text" style="ModernLeftLabelText" />
<object size="0 372 100%-15 373" type="image" sprite="ModernWhiteLine" z="25" />
<object size="0 360 100% 361" type="image" sprite="ModernWhiteLine" z="25" />
<object name="savedMods" size="0 375 100%-15 415" type="text" style="ModernLeftLabelText" />
<object name="savedMods" size="0 363 100% 419" type="text" style="ModernLeftLabelText" />
<object size="0 417 100%-15 418" type="image" sprite="ModernWhiteLine" z="25" />
<object name="savedPlayersNames" size="0 420 100%-10 100%-32" type="text" style="MapPlayerList" />
<object size="0 100%-32 100%-15 100%-31" type="image" sprite="ModernWhiteLine" z="25" />
<object size="0 421 100% 422" type="image" sprite="ModernWhiteLine" z="25" />
<object name="savedPlayersNames" size="0 424 100% 100%-34" type="text" style="MapPlayerList" />
<object size="0 100%-32 100% 100%-31" type="image" sprite="ModernWhiteLine" z="25" />
</object>
<object name="invalidGame" size="650 105 870 205" type="image" sprite="0ADLogo" />

4
binaries/data/mods/public/gui/lobby/AccountSettingsPage/AccountSettingsPage.js
View file

@ -52,6 +52,7 @@ var AccountSettingsPage = {
let timeout;
try
{
requestResult.textcolor = "white";
requestResult.caption = "Changing password…";
const encryptedPassword = AccountSettingsPage._readAndValidatePassword(SetPasswordError);
Engine.LobbyChangePassword(encryptedPassword);
@ -72,7 +73,10 @@ var AccountSettingsPage = {
catch (e)
{
if (e instanceof SetPasswordError)
{
requestResult.textcolor = "red";
requestResult.caption = e.message;
}
else
{
requestResult.caption = "";

8
binaries/data/mods/public/gui/lobby/AccountSettingsPage/AccountSettingsPage.xml
View file

@ -6,13 +6,13 @@
<!-- Translucent black background -->
<object type="image" z="100" sprite="ModernFade"/>
<object type="image" style="ModernDialog" size="50%-230 50%-150 50%+230 50%+150" z="101">
<object type="image" style="ModernDialog" size="50%-230 50%-140 50%+230 50%+140" z="101">
<object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">Account settings</translatableAttribute>
</object>
<object size="24 32 100%-24 100%-50">
<object size="24 32 100%-24 100%-24">
<object type="text" size="0 0 100% 24" style="ModernLeftLabelText">
<translatableAttribute id="caption">New password:</translatableAttribute>
</object>
@ -21,9 +21,9 @@
<translatableAttribute id="caption">Confirm new password:</translatableAttribute>
</object>
<object name="as_PasswordInputConfirm" mask="true" mask_char="*" size="0 76 100% 100" type="input" style="ModernInput" font="sans-13"/>
<object name="as_RequestResult" type="text" size="0 125 100% 150" style="ModernLeftLabelText"/>
<object name="as_RequestResult" type="text" size="0 112 100% 100%-40" style="ModernLabelText"/>
<object size="18 100%-32 100%-18 100%">
<object size="18 100%-28 100%-18 100%">
<object type="button" name="as_Close" style="ModernButtonRed" size="0 0 50%-5 100%">
<translatableAttribute id="caption">Close</translatableAttribute>
</object>

6
binaries/data/mods/public/gui/lobby/LeaderboardPage/LeaderboardPage.xml
View file

@ -13,13 +13,13 @@
</object>
<object name="leaderboardBox" style="ModernList" type="olist" size="19 19 100%-19 100%-62">
<column id="rank" textcolor="255 255 255" width="15%">
<column id="rank" textcolor="255 255 255" width="17%">
<translatableAttribute id="heading">Rank</translatableAttribute>
</column>
<column id="name" textcolor="255 255 255" width="55%">
<column id="name" textcolor="255 255 255" width="61%">
<translatableAttribute id="heading">Name</translatableAttribute>
</column>
<column id="rating" textcolor="255 255 255" width="30%">
<column id="rating" textcolor="255 255 255" width="22%">
<translatableAttribute id="heading">Rating</translatableAttribute>
</column>
</object>

9
binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatPanel.js
View file

@ -22,5 +22,14 @@ class ChatPanel
for (let name in ChatMessageEvents)
this.chatMessageEvents[name] = new ChatMessageEvents[name](
xmppMessages, this.chatMessagesPanel, this.statusMessageFormat, this.systemMessageFormat);
this.chatSubmit = Engine.GetGUIObjectByName("chatSubmit");
resizeGUIObjectToCaption(this.chatSubmit, { "horizontal": "left" }, { "horizontal": 8 });
this.chatInput = Engine.GetGUIObjectByName("chatInput");
let size = this.chatInput.size;
size.right = this.chatSubmit.size.left;
this.chatInput.size = size;
this.chatInput = Engine.GetGUIObjectByName("chatInput");
}
}

4
binaries/data/mods/public/gui/lobby/LobbyPage/GameList.xml
View file

@ -9,10 +9,10 @@
>
<column id="buddy" width="12"/>
<column id="private" width="20"/>
<column id="gameName" textcolor="128 128 128" width="33%-12">
<column id="gameName" textcolor="128 128 128" width="33%-32">
<translatableAttribute id="heading">Name</translatableAttribute>
</column>
<column id="mapName" textcolor="128 128 128" width="25%">
<column id="mapName" textcolor="128 128 128" width="24%">
<translatableAttribute id="heading">Map Name</translatableAttribute>
</column>
<column id="mapSize" textcolor="128 128 128" width="16%">

4
binaries/data/mods/public/gui/lobby/LobbyPage/GameListFilters.xml
View file

@ -11,14 +11,14 @@
<object name="mapSizeFilter"
type="dropdown"
style="ModernDropDown"
size="58%-5 0 74%-10 100%"
size="55%-5 0 72%-10 100%"
font="sans-bold-13">
</object>
<object name="mapTypeFilter"
type="dropdown"
style="ModernDropDown"
size="74%-5 0 90%-10 100%"
size="72%-5 0 90%-10 100%"
font="sans-bold-13">
</object>

11
binaries/data/mods/public/gui/lobby/ProfilePage/ProfilePage.js
View file

@ -11,6 +11,12 @@ class ProfilePage
this.profilePage = Engine.GetGUIObjectByName("profilePage");
this.fetchInput = Engine.GetGUIObjectByName("fetchInput");
this.fetchInputLabel = Engine.GetGUIObjectByName("fetchInputLabel");
resizeGUIObjectToCaption(this.fetchInputLabel, { "horizontal": "right" });
let size = this.fetchInput.size;
size.left = this.fetchInputLabel.size.right;
this.fetchInput.size = size;
this.fetchInput.onPress = this.onPressLookup.bind(this);
this.fetchInput.onTab = this.autocomplete.bind(this);
this.fetchInput.tooltip = colorizeAutocompleteHotkey();
@ -29,6 +35,11 @@ class ProfilePage
this.profileWindowArea = Engine.GetGUIObjectByName("profileWindowArea");
xmppMessages.registerXmppMessageHandler("game", "profile", this.onProfile.bind(this));
this.viewProfileButton = Engine.GetGUIObjectByName("viewProfileButton");
resizeGUIObjectToCaption(this.viewProfileButton, { "horizontal": "center" }, { "horizontal": 24 });
this.profileBackButton = Engine.GetGUIObjectByName("profileBackButton");
resizeGUIObjectToCaption(this.profileBackButton, { "horizontal": "center" }, { "horizontal": 24 });
}
registerClosePageHandler(handler)

10
binaries/data/mods/public/gui/lobby/ProfilePage/ProfilePage.xml
View file

@ -12,13 +12,13 @@
<translatableAttribute id="caption">Player Profile Lookup</translatableAttribute>
</object>
<object type="text" size="15 25 40% 50" text_align="right" textcolor="white">
<object type="text" name="fetchInputLabel" size="25 25 224 50" style="ModernLabelText">
<translatableAttribute id="caption">Enter playername:</translatableAttribute>
</object>
<object name="fetchInput" size="40%+10 25 100%-25 50" type="input" style="ModernInput" font="sans-13"/>
<object name="fetchInput" size="225 25 100%-25 50" type="input" style="ModernInput" font="sans-13"/>
<object name="viewProfileButton" type="button" style="ModernButtonRed" size="50%-64 60 50%+64 85">
<object name="viewProfileButton" type="button" style="ModernButtonRed" size="50%-64 60 50%+64 88">
<translatableAttribute id="caption">View Profile</translatableAttribute>
</object>
@ -51,13 +51,13 @@
</object>
<object name="profileRatioText" size="40%+45 130 100% 150" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-12" />
</object>
<object name="profileErrorText" size="25% 25% 75% 75%" type="text" style="ModernLabelText" font="sans-bold-stroke-13">
<object name="profileErrorText" size="15% 25% 85% 75%" type="text" style="ModernLabelText" font="sans-bold-stroke-13">
<translatableAttribute id="caption">Please enter a player name.</translatableAttribute>
</object>
</object>
</object>
<object type="button" name="profileBackButton" style="ModernButtonRed" size="50%-64 100%-50 50%+64 100%-25" hotkey="cancel">
<object type="button" name="profileBackButton" style="ModernButtonRed" size="50%-64 100%-52 50%+64 100%-24" hotkey="cancel">
<translatableAttribute id="caption">Back</translatableAttribute>
</object>

15
binaries/data/mods/public/gui/maps/mapbrowser/controls/MapBrowserControls.js
View file

@ -9,6 +9,21 @@ class MapBrowserPageControls
this.gridBrowser = gridBrowser;
this.setupButtons();
const alignmentHelper = new AlignmentHelper("max");
const labelMargin = 5;
this.mapBrowserSearchBoxLabel = Engine.GetGUIObjectByName("mapBrowserSearchBoxLabel");
this.mapBrowserSearchBoxControl = Engine.GetGUIObjectByName("mapBrowserSearchBoxControl");
alignmentHelper.setObject(this.mapBrowserSearchBoxControl, "left", this.mapBrowserSearchBoxLabel.size.right + labelMargin);
this.mapBrowserMapTypeLabel = Engine.GetGUIObjectByName("mapBrowserMapTypeLabel");
this.mapBrowserMapTypeControl = Engine.GetGUIObjectByName("mapBrowserMapTypeControl");
alignmentHelper.setObject(this.mapBrowserMapTypeControl, "left", this.mapBrowserMapTypeLabel.size.right + labelMargin);
this.mapBrowserMapFilterLabel = Engine.GetGUIObjectByName("mapBrowserMapFilterLabel");
this.mapBrowserMapFilterControl = Engine.GetGUIObjectByName("mapBrowserMapFilterControl");
alignmentHelper.setObject(this.mapBrowserMapFilterControl, "left", this.mapBrowserMapFilterLabel.size.right + labelMargin);
}
setupButtons()

10
binaries/data/mods/public/gui/maps/mapbrowser/controls/MapBrowserControls.xml
View file

@ -4,13 +4,11 @@
<!-- Page controls -->
<object>
<object name="mapBrowserPageStatus" type="text" style="ModernLabelText" size="0 0 180 30"/>
<object size="180 0 100%-60 30">
<object size="20% 0 80%-58 28">
<object name="mapBrowserPreviousButton" type="button" style="ModernButtonRed" size="0 0 50% 100%"/>
<object name="mapBrowserNextButton" type="button" style="ModernButtonRed" size="50% 0 100% 100%"/>
</object>
<object size="100%-60 0 100% 30">
<object size="100%-58 0 100% 28">
<object name="mapsZoomIn" type="button" style="ModernButtonRed" size="0 0 50% 100%">
<translatableAttribute id="caption" context="zoom in">+</translatableAttribute>
</object>
@ -18,9 +16,11 @@
<translatableAttribute id="caption" context="zoom out">−</translatableAttribute>
</object>
</object>
<object name="mapBrowserPageStatus" type="text" style="ModernLabelText" size="5% 32 95%-60 60"/>
</object>
<object size="0 35 100% 100%-60">
<object size="0 72 100% 100%-58">
<object size="0 0 100% 40">
<object name="mapBrowserSearchBoxLabel" type="text" style="ModernLeftLabelText" size="2 0 0 35">
<translatableAttribute id="caption">Search Map:</translatableAttribute>

10
binaries/data/mods/public/gui/options/options.xml
View file

@ -9,23 +9,23 @@
<object type="image" sprite="ModernFade"/>
<!-- Settings Window -->
<object name="options" type="image" style="ModernDialog" size="50%-350 50%-374 50%+350 50%+374">
<object name="options" type="image" style="ModernDialog" size="50%-400 50%-374 50%+400 50%+374">
<object style="ModernLabelText" type="text" size="50%-128 -16 50%+128 16">
<translatableAttribute id="caption">Game Options</translatableAttribute>
</object>
<!-- Category Tabs -->
<object size="15 16 210 100%-52">
<object size="15 16 230 100%-52">
<include file="gui/common/tab_buttons.xml"/>
</object>
<!-- Option Controls -->
<object name="option_controls" type="image" sprite="ModernDarkBoxGold" size="220 16 685 100%-52">
<object name="option_controls" type="image" sprite="ModernDarkBoxGold" size="240 16 785 100%-52">
<repeat count="25">
<object name="option_control[n]" size="0 0 100% 0">
<object name="option_label[n]" size="0 0 60% 100%" type="text" style="ModernLeftLabelText"/>
<object name="option_control_boolean[n]" size="90% 2 100% 100%+2" type="checkbox" style="ModernTickBox"/>
<object name="option_label[n]" size="0 0 65%-10 100%" type="text" style="ModernLeftLabelText"/>
<object name="option_control_boolean[n]" size="95% 2 100% 100%+2" type="checkbox" style="ModernTickBox"/>
<object name="option_control_string[n]" size="65% 0 100%-8 100%" type="input" style="ModernInput"/>
<object name="option_control_color[n]" size="65%+40 0 100%-8 100%" type="input" style="ModernInput">
<object type="image" size="-40 4 -24 100%-4" sprite="color:gold"/>

2
binaries/data/mods/public/gui/prelobby/common/terms/termslobby.xml
View file

@ -2,7 +2,7 @@
<object>
<repeat count="3" var="n">
<object name="termsButton[n]" type="button" size="20 0 100%-20 28" style="ModernButtonRed"/>
<object name="termsButton[n]" type="button" size="75 0 100%-75 28" style="ModernButtonRed"/>
</repeat>
</object>

6
binaries/data/mods/public/gui/prelobby/entrance/entrance.xml
View file

@ -8,7 +8,7 @@
<!-- Add a translucent black background to fade out the menu page -->
<object type="image" sprite="ModernFade"/>
<object name="dialog" type="image" style="ModernDialog" size="50%-215 50%-130 50%+215 50%+130">
<object name="dialog" type="image" style="ModernDialog" size="50%-215 50%-100 50%+215 50%+100">
<object style="ModernLabelText" type="text" size="50%-128 -18 50%+128 14">
<translatableAttribute id="caption">Multiplayer Lobby</translatableAttribute>
@ -16,12 +16,12 @@
<object size="0 32 100% 100%">
<object type="button" size="50 12 100%-50 68" style="ModernButtonRed">
<object type="button" size="50 12 100%-50 40" style="ModernButtonRed">
<translatableAttribute id="caption">Create a new account</translatableAttribute>
<action on="Press">registerButton();</action>
</object>
<object type="button" size="50 80 100%-50 136" style="ModernButtonRed">
<object type="button" size="50 52 100%-50 80" style="ModernButtonRed">
<translatableAttribute id="caption">Login to an existing account</translatableAttribute>
<action on="Press">loginButton();</action>
</object>

52
binaries/data/mods/public/gui/replaymenu/replay_menu.xml
View file

@ -15,7 +15,7 @@
</object>
<!-- Left Panel: Filters & Replay List -->
<object name="leftPanel" size="3% 5% 100%-255 100%-70">
<object name="leftPanel" size="3% 48 100%-255 100%-70">
<!-- Filters -->
<object name="filterPanel" size="0 0 100%-13 24">
@ -100,35 +100,35 @@
</object>
<!-- Right Panel: Compatibility Filter & Replay Details -->
<object name="rightPanel" size="100%-250 30 100%-20 100%-10" >
<object name="rightPanel" size="100%-250 48 100%-20 100%-10" >
<!-- Compatibility Filter Checkbox -->
<object name="compatibilityFilter" type="checkbox" checked="true" style="ModernTickBox" size="0 4 20 100%">
<object name="compatibilityFilter" type="checkbox" checked="true" style="ModernTickBox" size="0 2 20 100%">
<action on="Press">displayReplayList();</action>
</object>
<!-- Compatibility Filter Label -->
<object type="text" size="20 2 100% 100%" text_align="left" textcolor="white">
<object type="text" size="20 0 100% 50" text_align="left" textcolor="white">
<translatableAttribute id="caption">Filter compatible replays</translatableAttribute>
</object>
<!-- Single-player / Multiplayer Filter -->
<object name="singleplayerFilter" type="dropdown" style="ModernDropDown" size="0 30 100% 55" font="sans-bold-13">
<object name="singleplayerFilter" type="dropdown" style="ModernDropDown" size="0 55 100% 80" font="sans-bold-13">
<action on="SelectionChange">displayReplayList();</action>
</object>
<!-- Victory Condition Filter -->
<object name="victoryConditionFilter" type="dropdown" style="ModernDropDown" size="0 60 100% 85" font="sans-bold-13">
<object name="victoryConditionFilter" type="dropdown" style="ModernDropDown" size="0 90 100% 115" font="sans-bold-13">
<action on="SelectionChange">displayReplayList();</action>
</object>
<!-- Rated Games Filter -->
<object name="ratedGamesFilter" type="dropdown" style="ModernDropDown" size="0 90 100% 115" font="sans-bold-13">
<object name="ratedGamesFilter" type="dropdown" style="ModernDropDown" size="0 125 100% 150" font="sans-bold-13">
<action on="SelectionChange">displayReplayList();</action>
</object>
<!-- Placeholder to show if no replay is selected -->
<object name="replayInfoEmpty" size="0 120 100% 100%-60" type="image" sprite="ModernDarkBoxGold">
<object name="replayInfoEmpty" size="0 160 100% 100%-60" type="image" sprite="ModernDarkBoxGold">
<object name="logo" size="50%-110 40 50%+110 140" type="image" sprite="0ADLogo"/>
<object name="subjectBox" type="image" sprite="ModernDarkBoxWhite" size="3% 180 97% 99%">
<object name="subject" size="5 5 100%-5 100%-5" type="text" style="ModernText" text_align="center"/>
@ -136,7 +136,7 @@
</object>
<!-- Right panel: Replay details -->
<object name="replayInfo" size="0 120 100% 100%-60" type="image" sprite="ModernDarkBoxGold" hidden="true">
<object name="replayInfo" size="0 160 100% 100%-60" type="image" sprite="ModernDarkBoxGold" hidden="true">
<!-- Map Name Label -->
<object name="sgMapName" size="0 5 100% 20" type="text" style="ModernLabelText"/>
@ -145,55 +145,55 @@
<object name="sgMapPreview" size="5 25 100%-5 190" type="image" sprite=""/>
<!-- Separator Line -->
<object size="5 194 100%-5 195" type="image" sprite="ModernWhiteLine" z="25"/>
<object size="5 193 100%-5 194" type="image" sprite="ModernWhiteLine" z="25"/>
<!-- Map Type Caption -->
<object size="5 195 50% 225" type="image" sprite="ModernItemBackShadeLeft">
<object size="0 0 100%-10 100%" type="text" style="ModernRightLabelText">
<object size="5 195 50% 230" type="image" sprite="ModernItemBackShadeLeft">
<object size="4 0 100%-4 100%" type="text" style="ModernRightLabelText">
<translatableAttribute id="caption">Map Type:</translatableAttribute>
</object>
</object>
<!-- Map Type Label -->
<object size="50% 195 100%-5 225" type="image" sprite="ModernItemBackShadeRight">
<object name="sgMapType" type="text" style="ModernLeftLabelText"/>
<object size="50% 195 100%-5 230" type="image" sprite="ModernItemBackShadeRight">
<object name="sgMapType" size="4 0 100%-4 100%" type="text" style="ModernLeftLabelText"/>
</object>
<!-- Separator Line -->
<object size="5 224 100%-5 225" type="image" sprite="ModernWhiteLine" z="25"/>
<object size="5 230 100%-5 231" type="image" sprite="ModernWhiteLine" z="25"/>
<!-- Map Size Caption -->
<object size="5 225 50% 255" type="image" sprite="ModernItemBackShadeLeft">
<object size="0 0 100%-10 100%" type="text" style="ModernRightLabelText">
<object size="5 232 50% 267" type="image" sprite="ModernItemBackShadeLeft">
<object size="4 0 100%-4 100%" type="text" style="ModernRightLabelText">
<translatableAttribute id="caption">Map Size:</translatableAttribute>
</object>
</object>
<!-- Map Size Label -->
<object size="50% 225 100%-5 255" type="image" sprite="ModernItemBackShadeRight">
<object name="sgMapSize" type="text" style="ModernLeftLabelText"/>
<object size="50% 232 100%-5 267" type="image" sprite="ModernItemBackShadeRight">
<object name="sgMapSize" size="4 0 100%-4 100%" type="text" style="ModernLeftLabelText"/>
</object>
<!-- Separator Line -->
<object size="5 254 100%-5 255" type="image" sprite="ModernWhiteLine" z="25"/>
<object size="5 268 100%-5 269" type="image" sprite="ModernWhiteLine" z="25"/>
<!-- Victory Condition Caption -->
<object size="5 255 50% 295" type="image" sprite="ModernItemBackShadeLeft">
<object size="0 0 100%-10 100%" type="text" style="ModernRightLabelText">
<object size="5 270 50% 305" type="image" sprite="ModernItemBackShadeLeft">
<object size="4 0 100%-4 100%" type="text" style="ModernRightLabelText">
<translatableAttribute id="caption">Victory:</translatableAttribute>
</object>
</object>
<!-- Victory Condition Label -->
<object size="50% 255 100%-5 295" type="image" sprite="ModernItemBackShadeRight">
<object name="sgVictory" type="text" style="ModernText" font="sans-bold-stroke-14"/>
<object size="50% 270 100%-5 305" type="image" sprite="ModernItemBackShadeRight">
<object name="sgVictory" size="4 0 100%-4 100%" type="text" style="ModernLeftLabelText" font="sans-bold-stroke-14"/>
</object>
<!-- Separator Line -->
<object size="5 294 100%-5 295" type="image" sprite="ModernWhiteLine" z="25"/>
<object size="5 306 100%-5 307" type="image" sprite="ModernWhiteLine" z="25"/>
<!-- Map Description Text -->
<object type="image" sprite="ModernDarkBoxWhite" size="5 300 100%-5 40%+170">
<object type="image" sprite="ModernDarkBoxWhite" size="5 312 100%-5 40%+170">
<object name="sgMapDescription" size="0 1 100% 100%-1" type="text" style="ModernText" font="sans-12"/>
</object>

10
binaries/data/mods/public/gui/session/trade/BarterPanel.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<object name="tradeDialogPanelBarter">
<object type="text" size="8 0 100% 32" style="ModernLeftLabelText">
<object type="text" size="0 0 100% 32" style="ModernLeftLabelText">
<translatableAttribute id="caption">Barter</translatableAttribute>
</object>
@ -9,19 +9,19 @@
<object size="0 38 100% 122">
<object type="text" size="0 0 60 41" style="ModernRightLabelText">
<object type="text" size="0 0 100 41" style="ModernLeftLabelText">
<translatableAttribute id="caption">Sell:</translatableAttribute>
</object>
<object type="text" size="0 100%-41 60 100%" style="ModernRightLabelText">
<object type="text" size="0 100%-41 100 100%" style="ModernLeftLabelText">
<translatableAttribute id="caption">Buy:</translatableAttribute>
</object>
<object name="barterNoMarketsMessage" type="text" size="72 0 100% 100%" style="ModernLabelText">
<object name="barterNoMarketsMessage" type="text" size="112 0 100%-8 100%" style="ModernLabelText">
<translatableAttribute id="caption">No Markets Available</translatableAttribute>
</object>
<object name="barterResources" size="92 0 100% 100%" hotkey="session.massbarter">
<object name="barterResources" size="112 0 100% 100%" hotkey="session.massbarter">
<repeat count="10">
<object size="0 0 58 100%">
<include file="gui/session/trade/BarterButton.xml"/>

6
binaries/data/mods/public/gui/session/trade/TradeDialog.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<object name="tradeDialogPanel"
size="50%-90 50%-270 50%+90 50%+130"
size="50%-100 50%-264 50%+100 50%+124"
type="image"
hidden="true"
sprite="ModernDialog"
@ -9,12 +9,12 @@
<translatableAttribute id="caption">Barter &amp; Trade</translatableAttribute>
</object>
<object size="24 24 100%-24 33%">
<object size="24 24 100%-24 146">
<include file="gui/session/trade/BarterPanel.xml"/>
</object>
<!-- Trade -->
<object size="24 33%+32 100%-24 100%-64">
<object size="24 168 100%-24 100%-64">
<include file="gui/session/trade/TradePanel.xml"/>
</object>

6
binaries/data/mods/public/gui/session/trade/TradePanel.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<object name="tradeDialogPanelTrade">
<object type="text" size="8 0 100% 32" style="ModernLeftLabelText">
<object type="text" size="0 0 100% 32" style="ModernLeftLabelText">
<translatableAttribute id="caption">Trade</translatableAttribute>
</object>
@ -9,12 +9,12 @@
<object size="0 38 100% 70">
<object type="text" size="0 0 80 100%" style="ModernRightLabelText">
<object type="text" size="0 0 100 100%" style="ModernLeftLabelText">
<!-- Translation: Used in the Trade Dialog -->
<translatableAttribute id="caption">Resources:</translatableAttribute>
</object>
<object name="tradeResources" size="92 0 100% 100%">
<object name="tradeResources" size="112 0 100% 100%">
<repeat count="8">
<object name="tradeResource[n]" size="0 0 58 32">