epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More descriptive IDs that match between mods.

Browse Source
This commit is contained in:
Matthias Mailänder
2023-07-25 21:11:21 +02:00
committed by Gustas
parent 2b0afd6acb
commit de9a5eb71e
16 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/Logic/Settings/AudioSettingsLogic.cs
View File

@@ -113,7 +113,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
s => WidgetUtils.TruncateText(s.Label, audioDeviceDropdown.UsableWidth, deviceFont)); s => WidgetUtils.TruncateText(s.Label, audioDeviceDropdown.UsableWidth, deviceFont));
audioDeviceDropdown.GetText = () => deviceLabel.Update(soundDevice); audioDeviceDropdown.GetText = () => deviceLabel.Update(soundDevice);
var restartDesc = panel.Get("RESTART_REQUIRED_DESC"); var restartDesc = panel.Get("AUDIO_RESTART_REQUIRED_DESC");
restartDesc.IsVisible = () => soundDevice.Device != OriginalSoundDevice; restartDesc.IsVisible = () => soundDevice.Device != OriginalSoundDevice;
SettingsUtils.AdjustSettingsScrollPanelLayout(scrollPanel); SettingsUtils.AdjustSettingsScrollPanelLayout(scrollPanel);

2
OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs
View File

@@ -222,7 +222,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var origHeightText = windowHeight.Text = ds.WindowedSize.Y.ToString(NumberFormatInfo.CurrentInfo); var origHeightText = windowHeight.Text = ds.WindowedSize.Y.ToString(NumberFormatInfo.CurrentInfo);
windowHeight.Text = ds.WindowedSize.Y.ToString(NumberFormatInfo.CurrentInfo); windowHeight.Text = ds.WindowedSize.Y.ToString(NumberFormatInfo.CurrentInfo);
var restartDesc = panel.Get("RESTART_REQUIRED_DESC"); var restartDesc = panel.Get("VIDEO_RESTART_REQUIRED_DESC");
restartDesc.IsVisible = () => ds.Mode != OriginalGraphicsMode || ds.VideoDisplay != OriginalVideoDisplay || ds.GLProfile != OriginalGLProfile || restartDesc.IsVisible = () => ds.Mode != OriginalGraphicsMode || ds.VideoDisplay != OriginalVideoDisplay || ds.GLProfile != OriginalGLProfile ||
(ds.Mode == WindowMode.Windowed && (origWidthText != windowWidth.Text || origHeightText != windowHeight.Text)); (ds.Mode == WindowMode.Windowed && (origWidthText != windowWidth.Text || origHeightText != windowHeight.Text));

2
mods/cnc/chrome/connection.yaml
View File

@@ -5,7 +5,7 @@ Container@CONNECTING_PANEL:
Width: 370 Width: 370
Height: 125 Height: 125
Children: Children:
Label@TITLE: Label@CONNECTING_TITLE:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Y: 0 - 22 Y: 0 - 22
Font: BigBold Font: BigBold

14
mods/cnc/chrome/lobby-players.yaml
View File

@@ -8,48 +8,48 @@ Container@LOBBY_PLAYER_BIN:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
Label@NAME: Label@LABEL_LOBBY_NAME:
Width: 200 Width: 200
Height: 25 Height: 25
Text: Player Text: Player
Align: Center Align: Center
Font: Bold Font: Bold
Label@COLOR: Label@LABEL_LOBBY_COLOR:
X: 210 X: 210
Width: 94 Width: 94
Height: 25 Height: 25
Text: Color Text: Color
Align: Center Align: Center
Font: Bold Font: Bold
Label@FACTION: Label@LABEL_LOBBY_FACTION:
X: 309 X: 309
Width: 120 Width: 120
Height: 25 Height: 25
Text: Faction Text: Faction
Align: Center Align: Center
Font: Bold Font: Bold
Label@TEAM: Label@LABEL_LOBBY_TEAM:
X: 460 - 25 X: 460 - 25
Width: 50 Width: 50
Height: 25 Height: 25
Text: Team Text: Team
Align: Center Align: Center
Font: Bold Font: Bold
Label@HANDICAP: Label@LABEL_LOBBY_HANDICAP:
X: 491 X: 491
Width: 75 Width: 75
Height: 25 Height: 25
Text: Handicap Text: Handicap
Align: Center Align: Center
Font: Bold Font: Bold
Label@SPAWN: Label@LABEL_LOBBY_SPAWN:
X: 571 X: 571
Width: 50 Width: 50
Height: 25 Height: 25
Text: Spawn Text: Spawn
Align: Left Align: Left
Font: Bold Font: Bold
Label@STATUS: Label@LABEL_LOBBY_STATUS:
X: 627 X: 627
Width: 20 Width: 20
Height: 25 Height: 25

8
mods/cnc/chrome/mainmenu-prompts.yaml
View File

@@ -41,7 +41,7 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
ItemSpacing: 10 ItemSpacing: 10
ScrollBar: Hidden ScrollBar: Hidden
Children: Children:
Background@SECTION_HEADER: Background@PROFILE_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 10 Width: PARENT_RIGHT - 10
Height: 13 Height: 13
@@ -93,7 +93,7 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
Width: PARENT_RIGHT - 35 Width: PARENT_RIGHT - 35
Height: PARENT_BOTTOM - 12 Height: PARENT_BOTTOM - 12
Container@SPACER: Container@SPACER:
Background@SECTION_HEADER: Background@INPUT_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 10 Width: PARENT_RIGHT - 10
Height: 13 Height: 13
@@ -237,7 +237,7 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
Text: Screen Edge Panning Text: Screen Edge Panning
Container@SPACER: Container@SPACER:
Height: 30 Height: 30
Background@SECTION_HEADER: Background@DISPLAY_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 10 Width: PARENT_RIGHT - 10
Height: 13 Height: 13
@@ -309,7 +309,7 @@ Container@MAINMENU_SYSTEM_INFO_PROMPT:
Width: 600 Width: 600
Height: 350 Height: 350
Children: Children:
Label@TITLE: Label@PROMPT_TITLE:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Y: 0 - 25 Y: 0 - 25
Font: BigBold Font: BigBold

2
mods/cnc/chrome/multiplayer-directconnect.yaml
View File

@@ -5,7 +5,7 @@ Container@DIRECTCONNECT_PANEL:
Width: 370 Width: 370
Height: 125 Height: 125
Children: Children:
Label@TITLE: Label@DIRECTCONNECT_LABEL_TITLE:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Y: 0 - 22 Y: 0 - 22
Font: BigBold Font: BigBold

4
mods/cnc/chrome/settings-advanced.yaml
View File

@@ -10,7 +10,7 @@ Container@ADVANCED_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@SECTION_HEADER: Background@NETWORK_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13
@@ -97,7 +97,7 @@ Container@ADVANCED_PANEL:
WordWrap: True WordWrap: True
Text: Your Operating System, OpenGL and .NET runtime versions, and language settings will be sent along with an anonymous ID to help prioritize future development. Text: Your Operating System, OpenGL and .NET runtime versions, and language settings will be sent along with an anonymous ID to help prioritize future development.
Container@SPACER: Container@SPACER:
Background@SECTION_HEADER: Background@DEBUG_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13

4
mods/cnc/chrome/settings-audio.yaml
View File

@@ -10,7 +10,7 @@ Container@AUDIO_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@SECTION_HEADER: Background@AUDIO_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13
@@ -137,7 +137,7 @@ Container@AUDIO_PANEL:
X: 10 X: 10
Width: PARENT_RIGHT - 10 Width: PARENT_RIGHT - 10
Children: Children:
Label@RESTART_REQUIRED_DESC: Label@AUDIO_RESTART_REQUIRED_DESC:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 20 Height: 20
Font: Tiny Font: Tiny

8
mods/cnc/chrome/settings-display.yaml
View File

@@ -10,7 +10,7 @@ Container@DISPLAY_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@SECTION_HEADER: Background@PROFILE_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13
@@ -64,7 +64,7 @@ Container@DISPLAY_PANEL:
Width: PARENT_RIGHT - 35 Width: PARENT_RIGHT - 35
Height: PARENT_BOTTOM - 12 Height: PARENT_BOTTOM - 12
Container@SPACER: Container@SPACER:
Background@SECTION_HEADER: Background@DISPLAY_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13
@@ -202,7 +202,7 @@ Container@DISPLAY_PANEL:
Font: Regular Font: Regular
Text: Hide Chat in Replays Text: Hide Chat in Replays
Container@SPACER: Container@SPACER:
Background@SECTION_HEADER: Background@VIDEO_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13
@@ -344,7 +344,7 @@ Container@DISPLAY_PANEL:
X: 10 X: 10
Width: PARENT_RIGHT - 20 Width: PARENT_RIGHT - 20
Children: Children:
Label@RESTART_REQUIRED_DESC: Label@VIDEO_RESTART_REQUIRED_DESC:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 20 Height: 20
Font: Tiny Font: Tiny

2
mods/cnc/chrome/settings-input.yaml
View File

@@ -10,7 +10,7 @@ Container@INPUT_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@SECTION_HEADER: Background@INPUT_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13

2
mods/cnc/chrome/settings.yaml
View File

@@ -12,7 +12,7 @@ Container@SETTINGS_PANEL:
Width: 640 Width: 640
Height: 435 Height: 435
Children: Children:
Label@TITLE: Label@SETTINGS_LABEL_TITLE:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Y: 0 - 22 Y: 0 - 22
Font: BigBold Font: BigBold

6
mods/common/chrome/mainmenu-prompts.yaml
View File

@@ -36,7 +36,7 @@ Background@MAINMENU_INTRODUCTION_PROMPT:
ItemSpacing: 10 ItemSpacing: 10
ScrollBar: Hidden ScrollBar: Hidden
Children: Children:
Background@SECTION_HEADER: Background@PROFILE_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 10 Width: PARENT_RIGHT - 10
Height: 13 Height: 13
@@ -88,7 +88,7 @@ Background@MAINMENU_INTRODUCTION_PROMPT:
Width: PARENT_RIGHT - 35 Width: PARENT_RIGHT - 35
Height: PARENT_BOTTOM - 12 Height: PARENT_BOTTOM - 12
Container@SPACER: Container@SPACER:
Background@SECTION_HEADER: Background@INPUT_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 10 Width: PARENT_RIGHT - 10
Height: 13 Height: 13
@@ -232,7 +232,7 @@ Background@MAINMENU_INTRODUCTION_PROMPT:
Text: Screen Edge Panning Text: Screen Edge Panning
Container@SPACER: Container@SPACER:
Height: 30 Height: 30
Background@SECTION_HEADER: Background@DISPLAY_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 10 Width: PARENT_RIGHT - 10
Height: 13 Height: 13

4
mods/common/chrome/settings-advanced.yaml
View File

@@ -10,7 +10,7 @@ Container@ADVANCED_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@SECTION_HEADER: Background@NETWORK_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13
@@ -97,7 +97,7 @@ Container@ADVANCED_PANEL:
WordWrap: True WordWrap: True
Text: Your Operating System, OpenGL and .NET runtime versions, and language settings will be sent along with an anonymous ID to help prioritize future development. Text: Your Operating System, OpenGL and .NET runtime versions, and language settings will be sent along with an anonymous ID to help prioritize future development.
Container@SPACER: Container@SPACER:
Background@SECTION_HEADER: Background@DEBUG_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13

4
mods/common/chrome/settings-audio.yaml
View File

@@ -10,7 +10,7 @@ Container@AUDIO_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@SECTION_HEADER: Background@AUDIO_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13
@@ -137,7 +137,7 @@ Container@AUDIO_PANEL:
X: 10 X: 10
Width: PARENT_RIGHT - 10 Width: PARENT_RIGHT - 10
Children: Children:
Label@RESTART_REQUIRED_DESC: Label@AUDIO_RESTART_REQUIRED_DESC:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 20 Height: 20
Font: Tiny Font: Tiny

8
mods/common/chrome/settings-display.yaml
View File

@@ -10,7 +10,7 @@ Container@DISPLAY_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@SECTION_HEADER: Background@PROFILE_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13
@@ -64,7 +64,7 @@ Container@DISPLAY_PANEL:
Width: PARENT_RIGHT - 35 Width: PARENT_RIGHT - 35
Height: PARENT_BOTTOM - 12 Height: PARENT_BOTTOM - 12
Container@SPACER: Container@SPACER:
Background@SECTION_HEADER: Background@DISPLAY_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13
@@ -211,7 +211,7 @@ Container@DISPLAY_PANEL:
Font: Regular Font: Regular
Text: Hide Chat in Replays Text: Hide Chat in Replays
Container@SPACER: Container@SPACER:
Background@SECTION_HEADER: Background@VIDEO_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13
@@ -353,7 +353,7 @@ Container@DISPLAY_PANEL:
X: 10 X: 10
Width: PARENT_RIGHT - 20 Width: PARENT_RIGHT - 20
Children: Children:
Label@RESTART_REQUIRED_DESC: Label@VIDEO_RESTART_REQUIRED_DESC:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 20 Height: 20
Font: Tiny Font: Tiny

2
mods/common/chrome/settings-input.yaml
View File

@@ -10,7 +10,7 @@ Container@INPUT_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@SECTION_HEADER: Background@INPUT_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_RIGHT - 24 - 10 Width: PARENT_RIGHT - 24 - 10
Height: 13 Height: 13