Merge branch 'czukowski-language-switch-propery-fix' into jay

This commit is contained in:
Travis Nickles 2018-02-11 17:16:20 -06:00
commit ff3ab9905c

View File

@ -16,6 +16,12 @@ namespace DS4Windows.DS4Forms
private string InvariantCultureTextValue = "No (English UI)"; private string InvariantCultureTextValue = "No (English UI)";
private TaskCompletionSource<bool> LanguageListInitialized = new TaskCompletionSource<bool>(); private TaskCompletionSource<bool> LanguageListInitialized = new TaskCompletionSource<bool>();
// If probing path has been changed in App.config, add the same string here.
public string ProbingPath = "Lang";
// Filter language assembly file names in order to ont include irrelevant assemblies to the combo box.
public string LanguageAssemblyName = "DS4Windows.resources.dll";
[Category("Action")] [Category("Action")]
[Description("Fires when the combo box selected index is changed.")] [Description("Fires when the combo box selected index is changed.")]
public event EventHandler SelectedIndexChanged; public event EventHandler SelectedIndexChanged;
@ -45,14 +51,6 @@ namespace DS4Windows.DS4Forms
set { label1.Text = value; } set { label1.Text = value; }
} }
[Category("Data")]
[Description("If probing path has been changed in App.config, add the same string here.")]
public string ProbingPath { get; set; } = "Lang";
[Category("Data")]
[Description("Filter language assembly file names in order to ont include irrelevant assemblies to the combo box.")]
public string LanguageAssemblyName { get; set; } = "DS4Windows.resources.dll";
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public int SelectedIndex public int SelectedIndex
{ {