Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/LiveSplit.Splits/UI/Components/ColumnSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
using System.Linq;
using System.Windows.Forms;

using LiveSplit.Localization;
using LiveSplit.Model;
using LiveSplit.Model.Comparisons;

namespace LiveSplit.UI.Components;

public partial class ColumnSettings : UserControl
{
private static string T(string source) => UiLocalizer.Translate(source, LanguageResolver.ResolveCurrentCultureLanguage());

public string ColumnName { get => Data.Name; set => Data.Name = value; }
public string Type
{
Expand Down Expand Up @@ -61,6 +64,11 @@ private void cmbColumnType_SelectedIndexChanged(object sender, EventArgs e)

private void ColumnSettings_Load(object sender, EventArgs e)
{
if (string.Equals(ColumnName, "Time", StringComparison.Ordinal))
{
ColumnName = T("Time");
}

UpdateComparisonItems();

txtName.DataBindings.Clear();
Expand All @@ -69,6 +77,7 @@ private void ColumnSettings_Load(object sender, EventArgs e)
txtName.DataBindings.Add("Text", this, "ColumnName", false, DataSourceUpdateMode.OnPropertyChanged);
cmbColumnType.DataBindings.Add("SelectedItem", this, "Type", false, DataSourceUpdateMode.OnPropertyChanged);
cmbTimingMethod.DataBindings.Add("SelectedItem", this, "TimingMethod", false, DataSourceUpdateMode.OnPropertyChanged);
txtName_TextChanged(null, EventArgs.Empty);
}

public void UpdateEnabledButtons()
Expand All @@ -79,7 +88,7 @@ public void UpdateEnabledButtons()

private void txtName_TextChanged(object sender, EventArgs e)
{
groupColumn.Text = $"Column: {txtName.Text}";
groupColumn.Text = string.Format(T("Column: {0}"), txtName.Text);
}

private void UpdateComparisonItems()
Expand Down
2 changes: 1 addition & 1 deletion src/LiveSplit.Splits/UI/Components/SplitsSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public SplitsSettings(LiveSplitState state)

ColumnsList = [];
ColumnsList.Add(new ColumnSettings(CurrentState, "+/-", ColumnsList) { Data = new ColumnData("+/-", ColumnType.Delta, "Current Comparison", "Current Timing Method") });
ColumnsList.Add(new ColumnSettings(CurrentState, "Time", ColumnsList) { Data = new ColumnData("Time", ColumnType.SplitTime, "Current Comparison", "Current Timing Method") });
ColumnsList.Add(new ColumnSettings(CurrentState, T("Time"), ColumnsList) { Data = new ColumnData(T("Time"), ColumnType.SplitTime, "Current Comparison", "Current Timing Method") });

StartingColumnSettingHeight = ColumnsList[0].Height;
}
Expand Down