private readonly Config _config;\r
private readonly Form _form;\r
private readonly MainWindow.TimeOutChecker _suppressActivate;\r
- private CheckBox[] _shipTypeCheckBoxes;\r
+ private readonly CheckBox[] _shipTypeCheckBoxes;\r
private bool _isMaster;\r
private Settings _settings;\r
public const int PanelWidth = 215;\r
_form = main.Form;\r
_sniffer = main.Sniffer;\r
_config = main.Config;\r
- ApplySettings();\r
- SetupShipTypeCheckBoxes();\r
_suppressActivate = main.SuppressActivate;\r
- battleResultPanel.HpLabelClick += ToggleHpPercent;\r
- shipListPanel.HpLabelClick += ToggleHpPercent;\r
- var swipe = new SwipeScrollify();\r
- swipe.AddShipListPanel(shipListPanel);\r
- swipe.AddTreeView(itemTreeView);\r
- swipe.AddPanel(fleetPanel);\r
- }\r
-\r
- private void ApplySettings()\r
- {\r
- var config = GetConfig();\r
- _settings = Settings.FromShipListConfig(config);\r
- if (_settings.ShowHpInPercent)\r
- {\r
- shipListPanel.ToggleHpPercent();\r
- battleResultPanel.ToggleHpPercent();\r
- }\r
- LoadShipGroupFromConfig();\r
- comboBoxGroup.SelectedItem = _settings.Mode;\r
- }\r
-\r
- private void SetupShipTypeCheckBoxes()\r
- {\r
_shipTypeCheckBoxes = new[]\r
{\r
checkBoxSTypeBattleShip,\r
checkBoxSTypeSubmarine,\r
checkBoxSTypeAuxiliary\r
};\r
- SetCheckBoxSTypeState();\r
+ battleResultPanel.HpLabelClick += ToggleHpPercent;\r
+ shipListPanel.HpLabelClick += ToggleHpPercent;\r
+ var swipe = new SwipeScrollify();\r
+ swipe.AddShipListPanel(shipListPanel);\r
+ swipe.AddTreeView(itemTreeView);\r
+ swipe.AddPanel(fleetPanel);\r
}\r
\r
public void UpdateList()\r
{\r
AdjustHeader();\r
SetMinimumSize();\r
- comboBoxGroup.SelectedItem = _settings.Mode;\r
var config = GetConfig();\r
+ _settings = Settings.FromShipListConfig(config);\r
+ if (_settings.ShowHpInPercent)\r
+ {\r
+ shipListPanel.ToggleHpPercent();\r
+ battleResultPanel.ToggleHpPercent();\r
+ }\r
+ LoadShipGroupFromConfig();\r
+ comboBoxGroup.SelectedItem = _settings.Mode;\r
+ SetCheckBoxSTypeState();\r
if (config.Location.X == int.MinValue)\r
return;\r
var bounds = new Rectangle(config.Location, config.Size);\r
\r
public void SaveConfig()\r
{\r
+ if (_settings == null)\r
+ return;\r
if (_isMaster)\r
{\r
SaveMasterState();\r