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

Move settings to Gameplay tab.

Browse Source
This commit is contained in:
Paul Chote
2025-12-27 20:08:15 +00:00
committed by Gustas Kažukauskas
parent 27fbd3ddeb
commit 4436f07fbf
10 changed files with 232 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,6 @@ using System.Collections.ObjectModel;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Widgets; using OpenRA.Widgets;
@@ -73,7 +72,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly WorldViewportSizes viewportSizes; readonly WorldViewportSizes viewportSizes;
readonly GameSettings gameSettings; readonly GameSettings gameSettings;
readonly GraphicSettings graphicSettings; readonly GraphicSettings graphicSettings;
readonly PlayerSettings playerSettings;
static GraphicSettings originalGraphicSettings; static GraphicSettings originalGraphicSettings;
readonly string showOnDamage; readonly string showOnDamage;
@@ -94,7 +92,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
viewportSizes = modData.GetOrCreate<WorldViewportSizes>(); viewportSizes = modData.GetOrCreate<WorldViewportSizes>();
gameSettings = modData.GetSettings<GameSettings>(); gameSettings = modData.GetSettings<GameSettings>();
graphicSettings = modData.GetSettings<GraphicSettings>(); graphicSettings = modData.GetSettings<GraphicSettings>();
playerSettings = modData.GetSettings<PlayerSettings>();
originalGraphicSettings ??= graphicSettings.Clone(); originalGraphicSettings ??= graphicSettings.Clone();
legacyFullscreen = FluentProvider.GetMessage(LegacyFullscreen); legacyFullscreen = FluentProvider.GetMessage(LegacyFullscreen);
@@ -150,8 +147,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (panel.GetOrNull<CheckboxWidget>("PAUSE_SHELLMAP_CHECKBOX") != null) if (panel.GetOrNull<CheckboxWidget>("PAUSE_SHELLMAP_CHECKBOX") != null)
SettingsUtils.BindCheckboxPref(panel, "PAUSE_SHELLMAP_CHECKBOX", gameSettings, "PauseShellmap"); SettingsUtils.BindCheckboxPref(panel, "PAUSE_SHELLMAP_CHECKBOX", gameSettings, "PauseShellmap");
SettingsUtils.BindCheckboxPref(panel, "HIDE_REPLAY_CHAT_CHECKBOX", gameSettings, "HideReplayChat");
var windowModeDropdown = panel.Get<DropDownButtonWidget>("MODE_DROPDOWN"); var windowModeDropdown = panel.Get<DropDownButtonWidget>("MODE_DROPDOWN");
windowModeDropdown.OnMouseDown = _ => ShowWindowModeDropdown(windowModeDropdown, graphicSettings, scrollPanel); windowModeDropdown.OnMouseDown = _ => ShowWindowModeDropdown(windowModeDropdown, graphicSettings, scrollPanel);
windowModeDropdown.GetText = () => graphicSettings.Mode == WindowMode.Windowed windowModeDropdown.GetText = () => graphicSettings.Mode == WindowMode.Windowed
@@ -239,48 +234,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
panel.Get<SliderWidget>("FRAME_LIMIT_SLIDER").IsDisabled = () => !frameLimitCheckbox.IsChecked() || frameLimitGamespeedCheckbox.IsChecked(); panel.Get<SliderWidget>("FRAME_LIMIT_SLIDER").IsDisabled = () => !frameLimitCheckbox.IsChecked() || frameLimitGamespeedCheckbox.IsChecked();
var escPressed = false;
var nameTextfield = panel.Get<TextFieldWidget>("PLAYERNAME");
nameTextfield.IsDisabled = () => world.Type != WorldType.Shellmap;
nameTextfield.Text = Settings.SanitizedPlayerName(playerSettings.Name);
nameTextfield.OnLoseFocus = () =>
{
if (escPressed)
{
escPressed = false;
return;
}
nameTextfield.Text = nameTextfield.Text.Trim();
if (nameTextfield.Text.Length == 0)
nameTextfield.Text = Settings.SanitizedPlayerName(playerSettings.Name);
else
{
nameTextfield.Text = Settings.SanitizedPlayerName(nameTextfield.Text);
playerSettings.Name = nameTextfield.Text;
}
};
nameTextfield.OnEnterKey = _ => { nameTextfield.YieldKeyboardFocus(); return true; };
nameTextfield.OnEscKey = _ =>
{
nameTextfield.Text = Settings.SanitizedPlayerName(playerSettings.Name);
escPressed = true;
nameTextfield.YieldKeyboardFocus();
return true;
};
var colorManager = modData.DefaultRules.Actors[SystemActors.World].TraitInfo<IColorPickerManagerInfo>();
var colorDropdown = panel.Get<DropDownButtonWidget>("PLAYERCOLOR");
colorDropdown.IsDisabled = () => world.Type != WorldType.Shellmap;
colorDropdown.OnMouseDown = _ => colorManager.ShowColorDropDown(colorDropdown, playerSettings.Color, null, worldRenderer, color =>
{
playerSettings.Color = color;
playerSettings.Save();
});
colorDropdown.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => playerSettings.Color;
SettingsUtils.AdjustSettingsScrollPanelLayout(scrollPanel); SettingsUtils.AdjustSettingsScrollPanelLayout(scrollPanel);
return () => return () =>
@@ -288,7 +241,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
int.TryParse(windowWidth.Text, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out var x); int.TryParse(windowWidth.Text, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out var x);
int.TryParse(windowHeight.Text, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out var y); int.TryParse(windowHeight.Text, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out var y);
graphicSettings.WindowedSize = new int2(x, y); graphicSettings.WindowedSize = new int2(x, y);
nameTextfield.YieldKeyboardFocus();
return graphicSettings.Mode != originalGraphicSettings.Mode || return graphicSettings.Mode != originalGraphicSettings.Mode ||
graphicSettings.VideoDisplay != originalGraphicSettings.VideoDisplay || graphicSettings.VideoDisplay != originalGraphicSettings.VideoDisplay ||
@@ -302,7 +254,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
var defaultGameSettings = new GameSettings(); var defaultGameSettings = new GameSettings();
var defaultGraphicSettings = new GraphicSettings(); var defaultGraphicSettings = new GraphicSettings();
var defaultPlayerSettings = new PlayerSettings();
return () => return () =>
{ {
graphicSettings.CapFramerate = defaultGraphicSettings.CapFramerate; graphicSettings.CapFramerate = defaultGraphicSettings.CapFramerate;
@@ -324,9 +275,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Viewport.LastMousePos = (Viewport.LastMousePos.ToFloat2() * oldScale / graphicSettings.UIScale).ToInt2(); Viewport.LastMousePos = (Viewport.LastMousePos.ToFloat2() * oldScale / graphicSettings.UIScale).ToInt2();
} }
playerSettings.Color = defaultPlayerSettings.Color;
playerSettings.Name = defaultPlayerSettings.Name;
gameSettings.TextNotificationPoolFilters = defaultGameSettings.TextNotificationPoolFilters; gameSettings.TextNotificationPoolFilters = defaultGameSettings.TextNotificationPoolFilters;
}; };
} }

83
OpenRA.Mods.Common/Widgets/Logic/Settings/GamePlaySettingsLogic.cs
View File

@@ -11,6 +11,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Widgets; using OpenRA.Widgets;
@@ -33,25 +34,77 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly int[] autoSaveFileNumbers = [3, 5, 10, 20, 50, 100]; readonly int[] autoSaveFileNumbers = [3, 5, 10, 20, 50, 100];
readonly AutoSaveSettings autoSaveSettings; readonly AutoSaveSettings autoSaveSettings;
readonly GameSettings gameSettings;
readonly PlayerSettings playerSettings;
readonly WorldRenderer worldRenderer;
readonly ModData modData;
TextFieldWidget nameTextfield;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public GameplaySettingsLogic(ModData modData, SettingsLogic settingsLogic, string panelID, string label) public GameplaySettingsLogic(ModData modData, SettingsLogic settingsLogic, string panelID, string label, WorldRenderer worldRenderer)
{ {
this.modData = modData;
this.worldRenderer = worldRenderer;
autoSaveSettings = modData.GetSettings<AutoSaveSettings>(); autoSaveSettings = modData.GetSettings<AutoSaveSettings>();
gameSettings = modData.GetSettings<GameSettings>();
playerSettings = modData.GetSettings<PlayerSettings>();
settingsLogic.RegisterSettingsPanel(panelID, label, InitPanel, ResetPanel); settingsLogic.RegisterSettingsPanel(panelID, label, InitPanel, ResetPanel);
} }
Func<bool> InitPanel(Widget panel) Func<bool> InitPanel(Widget panel)
{ {
var scrollPanel = panel.Get<ScrollPanelWidget>("SETTINGS_SCROLLPANEL"); var scrollPanel = panel.Get<ScrollPanelWidget>("SETTINGS_SCROLLPANEL");
SettingsUtils.AdjustSettingsScrollPanelLayout(scrollPanel); var world = worldRenderer.World;
var escPressed = false;
nameTextfield = panel.Get<TextFieldWidget>("PLAYERNAME");
nameTextfield.IsDisabled = () => world.Type != WorldType.Shellmap;
nameTextfield.Text = Settings.SanitizedPlayerName(playerSettings.Name);
nameTextfield.OnLoseFocus = () =>
{
if (escPressed)
{
escPressed = false;
return;
}
nameTextfield.Text = nameTextfield.Text.Trim();
if (nameTextfield.Text.Length == 0)
nameTextfield.Text = Settings.SanitizedPlayerName(playerSettings.Name);
else
{
nameTextfield.Text = Settings.SanitizedPlayerName(nameTextfield.Text);
playerSettings.Name = nameTextfield.Text;
}
};
nameTextfield.OnEnterKey = _ => { nameTextfield.YieldKeyboardFocus(); return true; };
nameTextfield.OnEscKey = _ =>
{
nameTextfield.Text = Settings.SanitizedPlayerName(playerSettings.Name);
escPressed = true;
nameTextfield.YieldKeyboardFocus();
return true;
};
var colorManager = modData.DefaultRules.Actors[SystemActors.World].TraitInfo<IColorPickerManagerInfo>();
var colorDropdown = panel.Get<DropDownButtonWidget>("PLAYERCOLOR");
colorDropdown.IsDisabled = () => world.Type != WorldType.Shellmap;
colorDropdown.OnMouseDown = _ => colorManager.ShowColorDropDown(colorDropdown, playerSettings.Color, null, worldRenderer, color =>
{
playerSettings.Color = color;
playerSettings.Save();
});
colorDropdown.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => playerSettings.Color;
SettingsUtils.BindCheckboxPref(panel, "HIDE_REPLAY_CHAT_CHECKBOX", gameSettings, "HideReplayChat");
// Setup dropdown for auto-save interval
var autoSaveIntervalDropDown = panel.Get<DropDownButtonWidget>("AUTO_SAVE_INTERVAL_DROP_DOWN"); var autoSaveIntervalDropDown = panel.Get<DropDownButtonWidget>("AUTO_SAVE_INTERVAL_DROP_DOWN");
autoSaveIntervalDropDown.OnClick = () => autoSaveIntervalDropDown.OnClick = () =>
ShowAutoSaveIntervalDropdown(autoSaveIntervalDropDown, autoSaveSeconds); ShowAutoSaveIntervalDropdown(autoSaveIntervalDropDown, autoSaveSeconds);
autoSaveIntervalDropDown.GetText = () => GetMessageForAutoSaveInterval(autoSaveSettings.AutoSaveInterval); autoSaveIntervalDropDown.GetText = () => GetMessageForAutoSaveInterval(autoSaveSettings.AutoSaveInterval);
// Setup dropdown for auto-save number. // Setup dropdown for auto-save number.
@@ -61,12 +114,28 @@ namespace OpenRA.Mods.Common.Widgets.Logic
autoSaveNoDropDown.GetText = () => FluentProvider.GetMessage(AutoSaveMaxFileNumber, "saves", autoSaveSettings.AutoSaveMaxFileCount); autoSaveNoDropDown.GetText = () => FluentProvider.GetMessage(AutoSaveMaxFileNumber, "saves", autoSaveSettings.AutoSaveMaxFileCount);
autoSaveNoDropDown.IsDisabled = () => autoSaveSettings.AutoSaveInterval <= 0; autoSaveNoDropDown.IsDisabled = () => autoSaveSettings.AutoSaveInterval <= 0;
return () => false; SettingsUtils.AdjustSettingsScrollPanelLayout(scrollPanel);
return () =>
{
nameTextfield.YieldKeyboardFocus();
return false;
};
} }
Action ResetPanel(Widget panel) Action ResetPanel(Widget panel)
{ {
return () => { }; var defaultAutoSaveSettings = new AutoSaveSettings();
var defaultGameSettings = new GameSettings();
var defaultPlayerSettings = new PlayerSettings();
return () =>
{
nameTextfield.Text = playerSettings.Name = defaultPlayerSettings.Name;
playerSettings.Color = defaultPlayerSettings.Color;
autoSaveSettings.AutoSaveInterval = defaultAutoSaveSettings.AutoSaveInterval;
autoSaveSettings.AutoSaveMaxFileCount = defaultAutoSaveSettings.AutoSaveMaxFileCount;
gameSettings.HideReplayChat = defaultGameSettings.HideReplayChat;
};
} }
void ShowAutoSaveIntervalDropdown(DropDownButtonWidget dropdown, IEnumerable<int> options) void ShowAutoSaveIntervalDropdown(DropDownButtonWidget dropdown, IEnumerable<int> options)

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

@@ -10,60 +10,6 @@ Container@DISPLAY_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@PROFILE_SECTION_HEADER:
X: 5
Width: PARENT_WIDTH - 24 - 10
Height: 13
Background: separator
ClickThrough: True
Children:
Label@LABEL:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Font: TinyBold
Align: Center
Text: label-profile-section-header
Container@ROW:
Width: PARENT_WIDTH - 24
Height: 50
Children:
Container@PLAYER_CONTAINER:
X: 10
Width: PARENT_WIDTH / 2 - 20
Children:
LabelForInput@PLAYER:
Width: PARENT_WIDTH
Height: 20
Text: label-player-container
For: PLAYERNAME
TextField@PLAYERNAME:
Y: 25
Width: PARENT_WIDTH
Height: 25
MaxLength: 16
Text: Name
Container@PLAYERCOLOR_CONTAINER:
X: PARENT_WIDTH / 2 + 10
Width: PARENT_WIDTH / 2 - 20
Children:
LabelForInput@COLOR:
Width: PARENT_WIDTH
Height: 20
Text: label-playercolor-container-color
For: PLAYERCOLOR
DropDownButton@PLAYERCOLOR:
Y: 25
Width: 75
Height: 25
IgnoreChildMouseOver: true
PanelAlign: Right
Children:
ColorBlock@COLORBLOCK:
X: 5
Y: 6
Width: PARENT_WIDTH - 35
Height: PARENT_HEIGHT - 12
Container@SPACER:
Background@DISPLAY_SECTION_HEADER: Background@DISPLAY_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_WIDTH - 24 - 10 Width: PARENT_WIDTH - 24 - 10
@@ -188,19 +134,6 @@ Container@DISPLAY_PANEL:
Text: checkbox-transients-container.label Text: checkbox-transients-container.label
TooltipText: checkbox-transients-container.tooltip TooltipText: checkbox-transients-container.tooltip
TooltipContainer: SETTINGS_TOOLTIP_CONTAINER TooltipContainer: SETTINGS_TOOLTIP_CONTAINER
Container@ROW:
Width: PARENT_WIDTH - 24
Height: 20
Children:
Container@HIDE_REPLAY_CHAT_CHECKBOX_CONTAINER:
X: 10
Width: PARENT_WIDTH / 2 - 10
Children:
Checkbox@HIDE_REPLAY_CHAT_CHECKBOX:
Width: PARENT_WIDTH
Height: 20
Font: Regular
Text: checkbox-hide-replay-chat-container
Container@SPACER: Container@SPACER:
Background@VIDEO_SECTION_HEADER: Background@VIDEO_SECTION_HEADER:
X: 5 X: 5

75
mods/cnc/chrome/settings-gameplay.yaml
View File

@@ -10,7 +10,7 @@ Container@GAMEPLAY_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@INPUT_SECTION_HEADER: Background@PROFILE_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_WIDTH - 24 - 10 Width: PARENT_WIDTH - 24 - 10
Height: 13 Height: 13
@@ -22,7 +22,61 @@ Container@GAMEPLAY_PANEL:
Height: PARENT_HEIGHT Height: PARENT_HEIGHT
Font: TinyBold Font: TinyBold
Align: Center Align: Center
Text: label-game-play-section-header Text: label-profile-section-header
Container@ROW:
Width: PARENT_WIDTH - 24
Height: 50
Children:
Container@PLAYER_CONTAINER:
X: 10
Width: PARENT_WIDTH / 2 - 20
Children:
LabelForInput@PLAYER:
Width: PARENT_WIDTH
Height: 20
Text: label-player-container
For: PLAYERNAME
TextField@PLAYERNAME:
Y: 25
Width: PARENT_WIDTH
Height: 25
MaxLength: 16
Text: Name
Container@PLAYERCOLOR_CONTAINER:
X: PARENT_WIDTH / 2 + 10
Width: PARENT_WIDTH / 2 - 20
Children:
LabelForInput@COLOR:
Width: PARENT_WIDTH
Height: 20
Text: label-playercolor-container-color
For: PLAYERCOLOR
DropDownButton@PLAYERCOLOR:
Y: 25
Width: 75
Height: 25
IgnoreChildMouseOver: true
PanelAlign: Right
Children:
ColorBlock@COLORBLOCK:
X: 5
Y: 6
Width: PARENT_WIDTH - 35
Height: PARENT_HEIGHT - 12
Container@SPACER:
Background@GAMEPLAY_SECTION_HEADER:
X: 5
Width: PARENT_WIDTH - 24 - 10
Height: 13
Background: separator
ClickThrough: True
Children:
Label@LABEL:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Font: TinyBold
Align: Center
Text: label-gameplay-section-header
Container@ROW: Container@ROW:
Width: PARENT_WIDTH - 24 Width: PARENT_WIDTH - 24
Height: 50 Height: 50
@@ -35,7 +89,7 @@ Container@GAMEPLAY_PANEL:
Width: PARENT_WIDTH Width: PARENT_WIDTH
Height: 20 Height: 20
Font: Regular Font: Regular
Text: auto-save-interval-label Text: label-auto-save-interval
For: AUTO_SAVE_INTERVAL_DROP_DOWN For: AUTO_SAVE_INTERVAL_DROP_DOWN
DropDownButton@AUTO_SAVE_INTERVAL_DROP_DOWN: DropDownButton@AUTO_SAVE_INTERVAL_DROP_DOWN:
Y: 25 Y: 25
@@ -50,10 +104,23 @@ Container@GAMEPLAY_PANEL:
Width: PARENT_WIDTH Width: PARENT_WIDTH
Height: 20 Height: 20
Font: Regular Font: Regular
Text: auto-save-max-file-number-label Text: label-auto-save-max-file-number
For: AUTO_SAVE_FILE_NUMBER_DROP_DOWN For: AUTO_SAVE_FILE_NUMBER_DROP_DOWN
DropDownButton@AUTO_SAVE_FILE_NUMBER_DROP_DOWN: DropDownButton@AUTO_SAVE_FILE_NUMBER_DROP_DOWN:
Y: 25 Y: 25
Width: PARENT_WIDTH Width: PARENT_WIDTH
Height: 25 Height: 25
Font: Regular Font: Regular
Container@ROW:
Width: PARENT_WIDTH - 24
Height: 20
Children:
Container@HIDE_REPLAY_CHAT_CHECKBOX_CONTAINER:
X: 10
Width: PARENT_WIDTH / 2 - 10
Children:
Checkbox@HIDE_REPLAY_CHAT_CHECKBOX:
Width: PARENT_WIDTH
Height: 20
Font: Regular
Text: checkbox-hide-replay-chat-container

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

@@ -2,12 +2,12 @@ Container@SETTINGS_PANEL:
Logic: SettingsLogic Logic: SettingsLogic
ButtonStride: 0, 45 ButtonStride: 0, 45
Panels: Panels:
GAMEPLAY_PANEL: Gameplay
INPUT_PANEL: Input
DISPLAY_PANEL: Display DISPLAY_PANEL: Display
AUDIO_PANEL: Audio AUDIO_PANEL: Audio
INPUT_PANEL: Input
HOTKEYS_PANEL: Hotkeys HOTKEYS_PANEL: Hotkeys
ADVANCED_PANEL: Advanced ADVANCED_PANEL: Advanced
GAMEPLAY_PANEL: Gameplay
X: (WINDOW_WIDTH - WIDTH) / 2 X: (WINDOW_WIDTH - WIDTH) / 2
Y: (WINDOW_HEIGHT - HEIGHT) / 2 Y: (WINDOW_HEIGHT - HEIGHT) / 2
Width: 640 Width: 640

10
mods/cnc/fluent/chrome.ftl
View File

@@ -466,7 +466,7 @@ label-bg-prompt-text-a = We would like to collect some details that will help us
label-bg-prompt-text-b = With your permission, the following anonymous system data will be sent: label-bg-prompt-text-b = With your permission, the following anonymous system data will be sent:
checkbox-bg-sysinfo = Send System Information checkbox-bg-sysinfo = Send System Information
## mainmenu-prompts.yaml, settings-display.yaml ## mainmenu-prompts.yaml, settings-display.yaml, settings-gameplay.yaml
label-profile-section-header = Profile label-profile-section-header = Profile
label-player-container = Player Name: label-player-container = Player Name:
label-playercolor-container-color = Preferred Color: label-playercolor-container-color = Preferred Color:
@@ -684,9 +684,10 @@ label-video-volume-container = Video Volume:
label-restart-required-container-audio-desc = Device changes will be applied after the game is restarted label-restart-required-container-audio-desc = Device changes will be applied after the game is restarted
## settings-gameplay.yaml ## settings-gameplay.yaml
label-game-play-section-header = Auto-save label-gameplay-section-header = Gameplay
auto-save-interval-label = Auto-save frequency: label-auto-save-interval = Auto-save frequency:
auto-save-max-file-number-label = Auto-save limit: label-auto-save-max-file-number = Auto-save limit:
checkbox-hide-replay-chat-container = Hide Chat in Replays
## settings-display.yaml ## settings-display.yaml
label-target-lines-dropdown-container = Target Lines: label-target-lines-dropdown-container = Target Lines:
@@ -704,7 +705,6 @@ checkbox-transients-container =
.label = Show Game Event Notifications .label = Show Game Event Notifications
.tooltip = Show transient text notifications for game events .tooltip = Show transient text notifications for game events
checkbox-hide-replay-chat-container = Hide Chat in Replays
label-video-section-header = Video label-video-section-header = Video
label-video-mode-dropdown-container = Video Mode: label-video-mode-dropdown-container = Video Mode:
dropdownbutton-video-mode-dropdown-container = Windowed dropdownbutton-video-mode-dropdown-container = Windowed

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

@@ -10,60 +10,6 @@ Container@DISPLAY_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@PROFILE_SECTION_HEADER:
X: 5
Width: PARENT_WIDTH - 24 - 10
Height: 13
Background: separator
ClickThrough: True
Children:
Label@LABEL:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Font: TinyBold
Align: Center
Text: label-profile-section-header
Container@ROW:
Width: PARENT_WIDTH - 24
Height: 50
Children:
Container@PLAYER_CONTAINER:
X: 10
Width: PARENT_WIDTH / 2 - 20
Children:
LabelForInput@PLAYER:
Width: PARENT_WIDTH
Height: 20
Text: label-player-container
For: PLAYERNAME
TextField@PLAYERNAME:
Y: 25
Width: PARENT_WIDTH
Height: 25
MaxLength: 16
Text: Name
Container@PLAYERCOLOR_CONTAINER:
X: PARENT_WIDTH / 2 + 10
Width: PARENT_WIDTH / 2 - 20
Children:
LabelForInput@COLOR:
Width: PARENT_WIDTH
Height: 20
Text: label-playercolor-container-color
For: PLAYERCOLOR
DropDownButton@PLAYERCOLOR:
Y: 25
Width: 75
Height: 25
IgnoreChildMouseOver: true
PanelAlign: Right
Children:
ColorBlock@COLORBLOCK:
X: 5
Y: 6
Width: PARENT_WIDTH - 35
Height: PARENT_HEIGHT - 12
Container@SPACER:
Background@DISPLAY_SECTION_HEADER: Background@DISPLAY_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_WIDTH - 24 - 10 Width: PARENT_WIDTH - 24 - 10
@@ -201,15 +147,6 @@ Container@DISPLAY_PANEL:
Height: 20 Height: 20
Font: Regular Font: Regular
Text: checkbox-pause-shellmap-container Text: checkbox-pause-shellmap-container
Container@HIDE_REPLAY_CHAT_CHECKBOX_CONTAINER:
X: PARENT_WIDTH / 2 + 10
Width: PARENT_WIDTH / 2 - 10
Children:
Checkbox@HIDE_REPLAY_CHAT_CHECKBOX:
Width: PARENT_WIDTH
Height: 20
Font: Regular
Text: checkbox-hide-replay-chat-container
Container@SPACER: Container@SPACER:
Background@VIDEO_SECTION_HEADER: Background@VIDEO_SECTION_HEADER:
X: 5 X: 5

75
mods/common/chrome/settings-gameplay.yaml
View File

@@ -10,7 +10,7 @@ Container@GAMEPLAY_PANEL:
TopBottomSpacing: 5 TopBottomSpacing: 5
ItemSpacing: 10 ItemSpacing: 10
Children: Children:
Background@INPUT_SECTION_HEADER: Background@PROFILE_SECTION_HEADER:
X: 5 X: 5
Width: PARENT_WIDTH - 24 - 10 Width: PARENT_WIDTH - 24 - 10
Height: 13 Height: 13
@@ -22,7 +22,61 @@ Container@GAMEPLAY_PANEL:
Height: PARENT_HEIGHT Height: PARENT_HEIGHT
Font: TinyBold Font: TinyBold
Align: Center Align: Center
Text: label-game-play-section-header Text: label-profile-section-header
Container@ROW:
Width: PARENT_WIDTH - 24
Height: 50
Children:
Container@PLAYER_CONTAINER:
X: 10
Width: PARENT_WIDTH / 2 - 20
Children:
LabelForInput@PLAYER:
Width: PARENT_WIDTH
Height: 20
Text: label-player-container
For: PLAYERNAME
TextField@PLAYERNAME:
Y: 25
Width: PARENT_WIDTH
Height: 25
MaxLength: 16
Text: Name
Container@PLAYERCOLOR_CONTAINER:
X: PARENT_WIDTH / 2 + 10
Width: PARENT_WIDTH / 2 - 20
Children:
LabelForInput@COLOR:
Width: PARENT_WIDTH
Height: 20
Text: label-playercolor-container-color
For: PLAYERCOLOR
DropDownButton@PLAYERCOLOR:
Y: 25
Width: 75
Height: 25
IgnoreChildMouseOver: true
PanelAlign: Right
Children:
ColorBlock@COLORBLOCK:
X: 5
Y: 6
Width: PARENT_WIDTH - 35
Height: PARENT_HEIGHT - 12
Container@SPACER:
Background@GAMEPLAY_SECTION_HEADER:
X: 5
Width: PARENT_WIDTH - 24 - 10
Height: 13
Background: separator
ClickThrough: True
Children:
Label@LABEL:
Width: PARENT_WIDTH
Height: PARENT_HEIGHT
Font: TinyBold
Align: Center
Text: label-gameplay-section-header
Container@ROW: Container@ROW:
Width: PARENT_WIDTH - 24 Width: PARENT_WIDTH - 24
Height: 50 Height: 50
@@ -35,7 +89,7 @@ Container@GAMEPLAY_PANEL:
Width: PARENT_WIDTH Width: PARENT_WIDTH
Height: 20 Height: 20
Font: Regular Font: Regular
Text: auto-save-interval-label Text: label-auto-save-interval
DropDownButton@AUTO_SAVE_INTERVAL_DROP_DOWN: DropDownButton@AUTO_SAVE_INTERVAL_DROP_DOWN:
Y: 25 Y: 25
Width: PARENT_WIDTH Width: PARENT_WIDTH
@@ -49,9 +103,22 @@ Container@GAMEPLAY_PANEL:
Width: PARENT_WIDTH Width: PARENT_WIDTH
Height: 20 Height: 20
Font: Regular Font: Regular
Text: auto-save-nr-label Text: label-auto-save-max-file-number
DropDownButton@AUTO_SAVE_FILE_NUMBER_DROP_DOWN: DropDownButton@AUTO_SAVE_FILE_NUMBER_DROP_DOWN:
Y: 25 Y: 25
Width: PARENT_WIDTH Width: PARENT_WIDTH
Height: 25 Height: 25
Font: Regular Font: Regular
Container@ROW:
Width: PARENT_WIDTH - 24
Height: 50
Children:
Container@HIDE_REPLAY_CHAT_CHECKBOX_CONTAINER:
X: 10
Width: PARENT_WIDTH / 2 - 10
Children:
Checkbox@HIDE_REPLAY_CHAT_CHECKBOX:
Width: PARENT_WIDTH
Height: 20
Font: Regular
Text: checkbox-hide-replay-chat-container

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

@@ -2,12 +2,12 @@ Background@SETTINGS_PANEL:
Logic: SettingsLogic Logic: SettingsLogic
ButtonStride: 0, 35 ButtonStride: 0, 35
Panels: Panels:
GAMEPLAY_PANEL: Gameplay
INPUT_PANEL: Input
DISPLAY_PANEL: Display DISPLAY_PANEL: Display
AUDIO_PANEL: Audio AUDIO_PANEL: Audio
INPUT_PANEL: Input
HOTKEYS_PANEL: Hotkeys HOTKEYS_PANEL: Hotkeys
ADVANCED_PANEL: Advanced ADVANCED_PANEL: Advanced
GAMEPLAY_PANEL: Gameplay
X: (WINDOW_WIDTH - WIDTH) / 2 X: (WINDOW_WIDTH - WIDTH) / 2
Y: (WINDOW_HEIGHT - HEIGHT) / 2 Y: (WINDOW_HEIGHT - HEIGHT) / 2
Width: 900 Width: 900

10
mods/common/fluent/chrome.ftl
View File

@@ -286,7 +286,7 @@ label-mainmenu-system-info-prompt-text-a = We would like to collect some system
label-mainmenu-system-info-prompt-text-b = With your permission, the following anonymous data will be sent each game launch: label-mainmenu-system-info-prompt-text-b = With your permission, the following anonymous data will be sent each game launch:
checkbox-mainmenu-system-info-prompt-sysinfo = Send System Information checkbox-mainmenu-system-info-prompt-sysinfo = Send System Information
## mainmenu-prompts.yaml, settings-display.yaml ## mainmenu-prompts.yaml, settings-display.yaml, settings-gameplay.yaml
label-profile-section-header = Profile label-profile-section-header = Profile
label-player-container = Player Name: label-player-container = Player Name:
label-playercolor-container-color = Preferred Color: label-playercolor-container-color = Preferred Color:
@@ -494,9 +494,10 @@ label-video-volume-container = Video Volume:
label-restart-required-container-audio-desc = Device changes will be applied after the game is restarted label-restart-required-container-audio-desc = Device changes will be applied after the game is restarted
## settings-gameplay.yaml ## settings-gameplay.yaml
label-game-play-section-header = Auto-save label-gameplay-section-header = Gameplay
auto-save-interval-label = Auto-save frequency: label-auto-save-interval = Auto-save frequency:
auto-save-nr-label = Auto-save limit: label-auto-save-max-file-number = Auto-save limit:
checkbox-hide-replay-chat-container = Hide Chat in Replays
## settings-display.yaml ## settings-display.yaml
label-target-lines-dropdown-container = Target Lines: label-target-lines-dropdown-container = Target Lines:
@@ -515,7 +516,6 @@ checkbox-transients-container =
.tooltip = Show transient text notifications for game events .tooltip = Show transient text notifications for game events
checkbox-pause-shellmap-container = Pause Menu Background checkbox-pause-shellmap-container = Pause Menu Background
checkbox-hide-replay-chat-container = Hide Chat in Replays
label-video-section-header = Video label-video-section-header = Video
label-video-mode-dropdown-container = Video Mode: label-video-mode-dropdown-container = Video Mode:
dropdownbutton-video-mode-dropdown-container = Windowed dropdownbutton-video-mode-dropdown-container = Windowed