corrade-vassal – Diff between revs 2 and 5
?pathlinks?
Rev 2 | Rev 5 | |||
---|---|---|---|---|
Line 67... | Line 67... | |||
67 | } |
67 | } |
|
68 | if (uint.TryParse(mainForm.DataTimeout.Text, out outUint)) |
68 | if (uint.TryParse(mainForm.DataTimeout.Text, out outUint)) |
|
69 | { |
69 | { |
|
70 | Vassal.vassalConfiguration.DataTimeout = outUint; |
70 | Vassal.vassalConfiguration.DataTimeout = outUint; |
|
71 | } |
71 | } |
|
- | 72 | if (uint.TryParse(mainForm.RegionRestartDelay.Text, out outUint)) |
||
- | 73 | { |
||
- | 74 | Vassal.vassalConfiguration.RegionRestartDelay = outUint; |
||
- | 75 | } |
||
Line 72... | Line 76... | |||
72 | |
76 | |
|
73 | // filters |
77 | // filters |
|
74 | Vassal.vassalConfiguration.InputFilters = |
78 | Vassal.vassalConfiguration.InputFilters = |
|
75 | mainForm.ActiveInputFilters.Items.Cast<ListViewItem>().Select(o => (Filter)o.Tag).ToList(); |
79 | mainForm.ActiveInputFilters.Items.Cast<ListViewItem>().Select(o => (Filter)o.Tag).ToList(); |
|
Line 94... | Line 98... | |||
94 | mainForm.HTTPServerURL.Text = Vassal.vassalConfiguration.HTTPServerURL; |
98 | mainForm.HTTPServerURL.Text = Vassal.vassalConfiguration.HTTPServerURL; |
|
95 | mainForm.Group.Text = Vassal.vassalConfiguration.Group; |
99 | mainForm.Group.Text = Vassal.vassalConfiguration.Group; |
|
96 | mainForm.Password.Text = Vassal.vassalConfiguration.Password; |
100 | mainForm.Password.Text = Vassal.vassalConfiguration.Password; |
|
97 | mainForm.TeleportTimeout.Text = Vassal.vassalConfiguration.TeleportTimeout.ToString(Utils.EnUsCulture); |
101 | mainForm.TeleportTimeout.Text = Vassal.vassalConfiguration.TeleportTimeout.ToString(Utils.EnUsCulture); |
|
98 | mainForm.DataTimeout.Text = Vassal.vassalConfiguration.DataTimeout.ToString(Utils.EnUsCulture); |
102 | mainForm.DataTimeout.Text = Vassal.vassalConfiguration.DataTimeout.ToString(Utils.EnUsCulture); |
|
- | 103 | mainForm.RegionRestartDelay.Text = Vassal.vassalConfiguration.RegionRestartDelay.ToString(Utils.EnUsCulture); |
||
Line 99... | Line 104... | |||
99 | |
104 | |
|
100 | // filters |
105 | // filters |
|
101 | mainForm.ActiveInputFilters.Items.Clear(); |
106 | mainForm.ActiveInputFilters.Items.Clear(); |
|
102 | foreach (Filter filter in Vassal.vassalConfiguration.InputFilters) |
107 | foreach (Filter filter in Vassal.vassalConfiguration.InputFilters) |
|
Line 396... | Line 401... | |||
396 | |
401 | |
|
397 | private void SettingsFormShown(object sender, EventArgs e) |
402 | private void SettingsFormShown(object sender, EventArgs e) |
|
398 | { |
403 | { |
|
399 | GetUserConfiguration.Invoke(); |
404 | GetUserConfiguration.Invoke(); |
|
- | 405 | } |
||
- | 406 | |
||
- | 407 | private void SettingsFormClosing(object sender, FormClosingEventArgs e) |
||
- | 408 | { |
||
- | 409 | // apply configuration |
||
- | 410 | SetUserConfiguration.Invoke(); |
||
- | 411 | // save settings |
||
- | 412 | VassalConfiguration.Save(Vassal.VASSAL_CONSTANTS.VASSAL_CONFIGURATION_FILE, ref Vassal.vassalConfiguration); |
||
- | 413 | // set parameters for Vassal |
||
- | 414 | mainForm.Invoke((MethodInvoker) (() => |
||
- | 415 | { |
||
- | 416 | Vassal.vassalForm.Invoke((MethodInvoker) (() => |
||
- | 417 | { |
||
- | 418 | if (string.IsNullOrEmpty(Vassal.vassalForm.RegionRestartDelayBox.Text)) |
||
- | 419 | { |
||
- | 420 | Vassal.vassalForm.RegionRestartDelayBox.Text = mainForm.RegionRestartDelay.Text; |
||
- | 421 | } |
||
- | 422 | })); |
||
- | 423 | })); |
||
400 | } |
424 | } |
|
401 | } |
425 | } |