From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Wed, 11 Dec 2019 11:09:33 +0000 (+0900)
Subject: 一覧を戦況に自動で切り替えるかを設定可能にする
X-Git-Tag: v11.31~7
X-Git-Url: http://git.osdn.net/view?p=kancollesniffer%2FKancolleSniffer.git;a=commitdiff_plain;h=01d20dda5b1a04ea92f8ecbea5b6cbc58152b2a0

一覧を戦況に自動で切り替えるかを設定可能にする
---

diff --git a/KancolleSniffer/Config.cs b/KancolleSniffer/Config.cs
index f7d865d..56d9e9a 100644
--- a/KancolleSniffer/Config.cs
+++ b/KancolleSniffer/Config.cs
@@ -62,10 +62,11 @@ namespace KancolleSniffer
         public Size Size { get; set; }
         public string Mode { get; set; }
         public ShipCategory ShipCategories { get; set; } = ShipCategory.All;
-        public bool ShipType;
+        public bool ShipType { get; set; }
         public bool ShowHpInPercent { get; set; }
         public ListForm.SortOrder SortOrder { get; set; } = ListForm.SortOrder.ExpToNext;
         public List<List<int>> ShipGroup { get; set; }
+        public bool AutoBattleResult { get; set; } = true;
 
         public ShipListConfig()
         {
diff --git a/KancolleSniffer/ConfigDialog.Designer.cs b/KancolleSniffer/ConfigDialog.Designer.cs
index 39e48f8..a71a112 100644
--- a/KancolleSniffer/ConfigDialog.Designer.cs
+++ b/KancolleSniffer/ConfigDialog.Designer.cs
@@ -71,6 +71,7 @@ namespace KancolleSniffer
             this.checkBoxBalloon = new System.Windows.Forms.CheckBox();
             this.checkBoxFlash = new System.Windows.Forms.CheckBox();
             this.tabPageAchievement = new System.Windows.Forms.TabPage();
+            this.checkBoxAutoBattleResult = new System.Windows.Forms.CheckBox();
             this.checkBoxWarnBadDamageWithDamecon = new System.Windows.Forms.CheckBox();
             this.checkBoxPresetAkashi = new System.Windows.Forms.CheckBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
@@ -493,6 +494,7 @@ namespace KancolleSniffer
             // 
             // tabPageAchievement
             // 
+            this.tabPageAchievement.Controls.Add(this.checkBoxAutoBattleResult);
             this.tabPageAchievement.Controls.Add(this.checkBoxWarnBadDamageWithDamecon);
             this.tabPageAchievement.Controls.Add(this.checkBoxPresetAkashi);
             this.tabPageAchievement.Controls.Add(this.groupBox3);
@@ -505,24 +507,34 @@ namespace KancolleSniffer
             this.tabPageAchievement.Text = "機能";
             this.tabPageAchievement.UseVisualStyleBackColor = true;
             // 
+            // checkBoxAutoBattleResult
+            // 
+            this.checkBoxAutoBattleResult.AutoSize = true;
+            this.checkBoxAutoBattleResult.Location = new System.Drawing.Point(143, 134);
+            this.checkBoxAutoBattleResult.Name = "checkBoxAutoBattleResult";
+            this.checkBoxAutoBattleResult.Size = new System.Drawing.Size(96, 16);
+            this.checkBoxAutoBattleResult.TabIndex = 21;
+            this.checkBoxAutoBattleResult.Text = "戦況自動切替";
+            this.checkBoxAutoBattleResult.UseVisualStyleBackColor = true;
+            // 
             // checkBoxWarnBadDamageWithDamecon
             // 
             this.checkBoxWarnBadDamageWithDamecon.AutoSize = true;
-            this.checkBoxWarnBadDamageWithDamecon.Location = new System.Drawing.Point(20, 114);
+            this.checkBoxWarnBadDamageWithDamecon.Location = new System.Drawing.Point(20, 112);
             this.checkBoxWarnBadDamageWithDamecon.Name = "checkBoxWarnBadDamageWithDamecon";
-            this.checkBoxWarnBadDamageWithDamecon.Size = new System.Drawing.Size(168, 16);
+            this.checkBoxWarnBadDamageWithDamecon.Size = new System.Drawing.Size(124, 16);
             this.checkBoxWarnBadDamageWithDamecon.TabIndex = 20;
-            this.checkBoxWarnBadDamageWithDamecon.Text = "ダメコン装備でも大破警告する";
+            this.checkBoxWarnBadDamageWithDamecon.Text = "ダメコンあり大破警告";
             this.checkBoxWarnBadDamageWithDamecon.UseVisualStyleBackColor = true;
             // 
             // checkBoxPresetAkashi
             // 
             this.checkBoxPresetAkashi.AutoSize = true;
-            this.checkBoxPresetAkashi.Location = new System.Drawing.Point(20, 135);
+            this.checkBoxPresetAkashi.Location = new System.Drawing.Point(20, 134);
             this.checkBoxPresetAkashi.Name = "checkBoxPresetAkashi";
-            this.checkBoxPresetAkashi.Size = new System.Drawing.Size(141, 16);
+            this.checkBoxPresetAkashi.Size = new System.Drawing.Size(113, 16);
             this.checkBoxPresetAkashi.TabIndex = 19;
-            this.checkBoxPresetAkashi.Text = "プリセット明石修理を使う";
+            this.checkBoxPresetAkashi.Text = "プリセット明石修理";
             this.checkBoxPresetAkashi.UseVisualStyleBackColor = true;
             // 
             // groupBox3
@@ -1330,5 +1342,6 @@ namespace KancolleSniffer
         private System.Windows.Forms.Label label17;
         private System.Windows.Forms.Label label18;
         private System.Windows.Forms.CheckBox checkBoxWarnBadDamageWithDamecon;
+        private System.Windows.Forms.CheckBox checkBoxAutoBattleResult;
     }
 }
\ No newline at end of file
diff --git a/KancolleSniffer/ConfigDialog.cs b/KancolleSniffer/ConfigDialog.cs
index 961de2f..e5644ed 100644
--- a/KancolleSniffer/ConfigDialog.cs
+++ b/KancolleSniffer/ConfigDialog.cs
@@ -94,6 +94,7 @@ namespace KancolleSniffer
             checkBoxNextCell.Checked = (_config.Spoilers & Spoiler.NextCell) != 0;
             checkBoxPresetAkashi.Checked = _config.UsePresetAkashi;
             checkBoxWarnBadDamageWithDamecon.Checked = _config.WarnBadDamageWithDameCon;
+            checkBoxAutoBattleResult.Checked = _config.ShipList.AutoBattleResult;
 
             numericUpDownSoundVolume.Value = _config.Sounds.Volume;
             foreach (var name in Config.NotificationNames)
@@ -200,6 +201,7 @@ namespace KancolleSniffer
                                (checkBoxNextCell.Checked ? Spoiler.NextCell : 0);
             _config.UsePresetAkashi = checkBoxPresetAkashi.Checked;
             _config.WarnBadDamageWithDameCon = checkBoxWarnBadDamageWithDamecon.Checked;
+            _config.ShipList.AutoBattleResult = checkBoxAirBattleResult.Checked;
 
             _config.Sounds.Volume = (int)numericUpDownSoundVolume.Value;
             foreach (var name in Config.NotificationNames)
diff --git a/KancolleSniffer/ListForm.cs b/KancolleSniffer/ListForm.cs
index c0fb857..6e4d5b0 100644
--- a/KancolleSniffer/ListForm.cs
+++ b/KancolleSniffer/ListForm.cs
@@ -169,7 +169,8 @@ namespace KancolleSniffer
 
         private void MoveToBattleResult()
         {
-            if (comboBoxGroup.SelectedIndex == BattleResultIndex || _sniffer.InSortie == -1)
+            if (!_config.ShipList.AutoBattleResult || comboBoxGroup.SelectedIndex == BattleResultIndex ||
+                _sniffer.InSortie == -1)
                 return;
             _prevSelectedIndex = comboBoxGroup.SelectedIndex;
             comboBoxGroup.SelectedIndex = BattleResultIndex;