制空値抜きの表示をメインにする設定を削除する

diff --git a/KancolleSniffer/Config.cs b/KancolleSniffer/Config.cs
index 9398ab5..664889e 100644 (file)
--- a/KancolleSniffer/Config.cs
+++ b/KancolleSniffer/Config.cs
@@ -94,7 +94,6 @@ namespace KancolleSniffer
         public List<int> NotifyConditions { get; set; }\r
         public List<int> ResetHours { get; set; }\r
         public bool AlwaysShowResultRank { get; set; }\r
-        public bool WithAlvBonus { get; set; }\r
         public int SoundVolume { get; set; }\r
         public string MissionSoundFile { get; set; }\r
         public string NDockSoundFile { get; set; }\r
@@ -122,7 +121,6 @@ namespace KancolleSniffer
             NotifyConditions = new List<int>(new[] {40, 49});\r
             ResetHours = new List<int>(new[] {2});\r
             AlwaysShowResultRank = false;\r
-            WithAlvBonus = true;\r
             SoundVolume = 100;\r
             MissionSoundFile = "ensei.mp3";\r
             NDockSoundFile = "nyuukyo.mp3";\r

diff --git a/KancolleSniffer/ConfigDialog.Designer.cs b/KancolleSniffer/ConfigDialog.Designer.cs
index 8c47651..79b310a 100644 (file)
--- a/KancolleSniffer/ConfigDialog.Designer.cs
+++ b/KancolleSniffer/ConfigDialog.Designer.cs
@@ -120,7 +120,6 @@ namespace KancolleSniffer
             this.toolTipError = new System.Windows.Forms.ToolTip(this.components);\r
             this.folderBrowserDialogOutputDir = new System.Windows.Forms.FolderBrowserDialog();\r
             this.openDebugLogDialog = new System.Windows.Forms.OpenFileDialog();\r
-            this.checkBoxWithAlvBonus = new System.Windows.Forms.CheckBox();\r
             this.tabControl.SuspendLayout();\r
             this.tabPageShow.SuspendLayout();\r
             this.tabPageNotification.SuspendLayout();\r
@@ -340,7 +339,6 @@ namespace KancolleSniffer
             // \r
             // tabPageAchievement\r
             // \r
-            this.tabPageAchievement.Controls.Add(this.checkBoxWithAlvBonus);\r
             this.tabPageAchievement.Controls.Add(this.groupBox3);\r
             this.tabPageAchievement.Controls.Add(this.groupBox2);\r
             this.tabPageAchievement.Location = new System.Drawing.Point(4, 40);\r
@@ -917,16 +915,6 @@ namespace KancolleSniffer
             this.openDebugLogDialog.CheckFileExists = false;\r
             this.openDebugLogDialog.Title = "ログファイルの選択";\r
             // \r
-            // checkBoxWithAlvBonus\r
-            // \r
-            this.checkBoxWithAlvBonus.AutoSize = true;\r
-            this.checkBoxWithAlvBonus.Location = new System.Drawing.Point(20, 119);\r
-            this.checkBoxWithAlvBonus.Name = "checkBoxWithAlvBonus";\r
-            this.checkBoxWithAlvBonus.Size = new System.Drawing.Size(157, 16);\r
-            this.checkBoxWithAlvBonus.TabIndex = 19;\r
-            this.checkBoxWithAlvBonus.Text = "制空値に熟練度を反映する";\r
-            this.checkBoxWithAlvBonus.UseVisualStyleBackColor = true;\r
-            // \r
             // ConfigDialog\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r
@@ -950,7 +938,6 @@ namespace KancolleSniffer
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMarginEquips)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMarginShips)).EndInit();\r
             this.tabPageAchievement.ResumeLayout(false);\r
-            this.tabPageAchievement.PerformLayout();\r
             this.groupBox3.ResumeLayout(false);\r
             this.groupBox3.PerformLayout();\r
             this.groupBox2.ResumeLayout(false);\r
@@ -1052,6 +1039,5 @@ namespace KancolleSniffer
         private System.Windows.Forms.GroupBox groupBox2;\r
         private System.Windows.Forms.RadioButton radioButtonResultRankWhenClick;\r
         private System.Windows.Forms.RadioButton radioButtonResultRankAlways;\r
-        private System.Windows.Forms.CheckBox checkBoxWithAlvBonus;\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/ConfigDialog.cs b/KancolleSniffer/ConfigDialog.cs
index 5437c26..858f914 100644 (file)
--- a/KancolleSniffer/ConfigDialog.cs
+++ b/KancolleSniffer/ConfigDialog.cs
@@ -64,7 +64,6 @@ namespace KancolleSniffer
             checkBoxReset14.Checked = _config.ResetHours.Contains(14);\r
             radioButtonResultRankAlways.Checked = _config.AlwaysShowResultRank;\r
             radioButtonResultRankWhenClick.Checked = !_config.AlwaysShowResultRank;\r
-            checkBoxWithAlvBonus.Checked = _config.WithAlvBonus;\r
 \r
             numericUpDownSoundVolume.Value = _config.SoundVolume;\r
 \r
@@ -168,7 +167,6 @@ namespace KancolleSniffer
                 _config.ResetHours.Add(14);\r
 \r
             _config.AlwaysShowResultRank = radioButtonResultRankAlways.Checked;\r
-            _config.WithAlvBonus = checkBoxWithAlvBonus.Checked;\r
             _main.UpdateFighterPower();\r
 \r
             _config.SoundVolume = (int)numericUpDownSoundVolume.Value;\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index 0c093c8..e290a63 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -454,9 +454,8 @@ namespace KancolleSniffer
 \r
         public void UpdateFighterPower()\r
         {\r
-            labelFighterPower.Text = _sniffer.GetFighterPower(_currentFleet, _config.WithAlvBonus).ToString("D");\r
-            toolTipFigherPower.SetToolTip(labelFighterPower,\r
-                (!_config.WithAlvBonus ? "熟練度込み " : "熟練度抜き ") + _sniffer.GetFighterPower(_currentFleet, !_config.WithAlvBonus));\r
+            labelFighterPower.Text = _sniffer.GetFighterPower(_currentFleet, true).ToString("D");\r
+            toolTipFigherPower.SetToolTip(labelFighterPower, "熟練度抜き " + _sniffer.GetFighterPower(_currentFleet, false));\r
         }\r
 \r
         private void UpdateLoS()\r