OSDN Git Service

設定でダメコン装備でも大破警告を出せるようにする
[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / ConfigDialog.Designer.cs
index e668b79..39e48f8 100644 (file)
@@ -1,19 +1,16 @@
 // Copyright (C) 2014, 2015 Kazuhiro Fujieda <fujieda@users.osdn.me>\r
 // \r
-// This program is part of KancolleSniffer.\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
 //\r
-// KancolleSniffer is free software: you can redistribute it and/or modify\r
-// it under the terms of the GNU General Public License as published by\r
-// the Free Software Foundation, either version 3 of the License, or\r
-// (at your option) any later version.\r
+//    http://www.apache.org/licenses/LICENSE-2.0\r
 //\r
-// This program is distributed in the hope that it will be useful,\r
-// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-// GNU General Public License for more details.\r
-//\r
-// You should have received a copy of the GNU General Public License\r
-// along with this program; if not, see <http://www.gnu.org/licenses/>.\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
 \r
 namespace KancolleSniffer\r
 {\r
@@ -45,12 +42,22 @@ namespace KancolleSniffer
         /// </summary>\r
         private void InitializeComponent()\r
         {\r
-            this.components = new System.ComponentModel.Container();\r
             this.tabControl = new System.Windows.Forms.TabControl();\r
-            this.tabPageShow = new System.Windows.Forms.TabPage();\r
+            this.tabPageWindow = new System.Windows.Forms.TabPage();\r
+            this.label18 = new System.Windows.Forms.Label();\r
+            this.label17 = new System.Windows.Forms.Label();\r
+            this.label8 = new System.Windows.Forms.Label();\r
+            this.numericUpDownQuest = new System.Windows.Forms.NumericUpDown();\r
+            this.checkBoxLocationPerMachine = new System.Windows.Forms.CheckBox();\r
+            this.checkBoxExitSilently = new System.Windows.Forms.CheckBox();\r
+            this.label15 = new System.Windows.Forms.Label();\r
+            this.comboBoxZoom = new System.Windows.Forms.ComboBox();\r
+            this.label14 = new System.Windows.Forms.Label();\r
             this.checkBoxHideOnMinimized = new System.Windows.Forms.CheckBox();\r
             this.checkBoxTopMost = new System.Windows.Forms.CheckBox();\r
             this.tabPageNotification = new System.Windows.Forms.TabPage();\r
+            this.checkBoxRepeat = new System.Windows.Forms.CheckBox();\r
+            this.buttonDetailedSettings = new System.Windows.Forms.Button();\r
             this.label6 = new System.Windows.Forms.Label();\r
             this.checkBoxCond49 = new System.Windows.Forms.CheckBox();\r
             this.checkBoxCond40 = new System.Windows.Forms.CheckBox();\r
@@ -64,9 +71,13 @@ namespace KancolleSniffer
             this.checkBoxBalloon = new System.Windows.Forms.CheckBox();\r
             this.checkBoxFlash = new System.Windows.Forms.CheckBox();\r
             this.tabPageAchievement = new System.Windows.Forms.TabPage();\r
+            this.checkBoxWarnBadDamageWithDamecon = new System.Windows.Forms.CheckBox();\r
+            this.checkBoxPresetAkashi = new System.Windows.Forms.CheckBox();\r
             this.groupBox3 = new System.Windows.Forms.GroupBox();\r
-            this.radioButtonResultRankWhenClick = new System.Windows.Forms.RadioButton();\r
-            this.radioButtonResultRankAlways = new System.Windows.Forms.RadioButton();\r
+            this.checkBoxNextCell = new System.Windows.Forms.CheckBox();\r
+            this.checkBoxBattleResult = new System.Windows.Forms.CheckBox();\r
+            this.checkBoxAirBattleResult = new System.Windows.Forms.CheckBox();\r
+            this.checkBoxResultRank = new System.Windows.Forms.CheckBox();\r
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.checkBoxReset02 = new System.Windows.Forms.CheckBox();\r
             this.buttonResetAchievement = new System.Windows.Forms.Button();\r
@@ -80,7 +91,7 @@ namespace KancolleSniffer
             this.label3 = new System.Windows.Forms.Label();\r
             this.tabPageVersion = new System.Windows.Forms.TabPage();\r
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();\r
-            this.label7 = new System.Windows.Forms.Label();\r
+            this.labelCopyright = new System.Windows.Forms.Label();\r
             this.linkLabelProductName = new System.Windows.Forms.LinkLabel();\r
             this.labelVersion = new System.Windows.Forms.Label();\r
             this.labelLatest = new System.Windows.Forms.Label();\r
@@ -90,14 +101,12 @@ namespace KancolleSniffer
             this.radioButtonUpstreamOn = new System.Windows.Forms.RadioButton();\r
             this.textBoxPort = new System.Windows.Forms.TextBox();\r
             this.labelPort = new System.Windows.Forms.Label();\r
+            this.groupBoxAutoConfig = new System.Windows.Forms.GroupBox();\r
+            this.radioButtonAutoConfigOff = new System.Windows.Forms.RadioButton();\r
+            this.radioButtonAutoConfigOn = new System.Windows.Forms.RadioButton();\r
             this.textBoxListen = new System.Windows.Forms.TextBox();\r
             this.labelListen = new System.Windows.Forms.Label();\r
             this.tabPageLog = new System.Windows.Forms.TabPage();\r
-            this.groupBox1 = new System.Windows.Forms.GroupBox();\r
-            this.radioButtonServerOff = new System.Windows.Forms.RadioButton();\r
-            this.radioButtonServerOn = new System.Windows.Forms.RadioButton();\r
-            this.textBoxServer = new System.Windows.Forms.TextBox();\r
-            this.label12 = new System.Windows.Forms.Label();\r
             this.label10 = new System.Windows.Forms.Label();\r
             this.checkBoxOutput = new System.Windows.Forms.CheckBox();\r
             this.label9 = new System.Windows.Forms.Label();\r
@@ -105,6 +114,19 @@ namespace KancolleSniffer
             this.textBoxOutput = new System.Windows.Forms.TextBox();\r
             this.label11 = new System.Windows.Forms.Label();\r
             this.buttonOutputDir = new System.Windows.Forms.Button();\r
+            this.tabPagePush = new System.Windows.Forms.TabPage();\r
+            this.groupBoxPushover = new System.Windows.Forms.GroupBox();\r
+            this.buttonPushoverTest = new System.Windows.Forms.Button();\r
+            this.label16 = new System.Windows.Forms.Label();\r
+            this.label12 = new System.Windows.Forms.Label();\r
+            this.textBoxPushoverUserKey = new System.Windows.Forms.TextBox();\r
+            this.checkBoxPushoverOn = new System.Windows.Forms.CheckBox();\r
+            this.textBoxPushoverApiKey = new System.Windows.Forms.TextBox();\r
+            this.groupBoxPushbullet = new System.Windows.Forms.GroupBox();\r
+            this.buttonPushbulletTest = new System.Windows.Forms.Button();\r
+            this.textBoxPushbulletToken = new System.Windows.Forms.TextBox();\r
+            this.label7 = new System.Windows.Forms.Label();\r
+            this.checkBoxPushbulletOn = new System.Windows.Forms.CheckBox();\r
             this.tabPageDebug = new System.Windows.Forms.TabPage();\r
             this.buttonPlayDebugLog = new System.Windows.Forms.Button();\r
             this.buttonDebugLogOpenFile = new System.Windows.Forms.Button();\r
@@ -114,11 +136,11 @@ namespace KancolleSniffer
             this.buttonCancel = new System.Windows.Forms.Button();\r
             this.buttonOk = new System.Windows.Forms.Button();\r
             this.openSoundFileDialog = new System.Windows.Forms.OpenFileDialog();\r
-            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.tabControl.SuspendLayout();\r
-            this.tabPageShow.SuspendLayout();\r
+            this.tabPageWindow.SuspendLayout();\r
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQuest)).BeginInit();\r
             this.tabPageNotification.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMarginEquips)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMarginShips)).BeginInit();\r
@@ -130,9 +152,12 @@ namespace KancolleSniffer
             this.tabPageVersion.SuspendLayout();\r
             this.tabPageProxy.SuspendLayout();\r
             this.groupBoxUpstream.SuspendLayout();\r
+            this.groupBoxAutoConfig.SuspendLayout();\r
             this.tabPageLog.SuspendLayout();\r
-            this.groupBox1.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaterialLogInterval)).BeginInit();\r
+            this.tabPagePush.SuspendLayout();\r
+            this.groupBoxPushover.SuspendLayout();\r
+            this.groupBoxPushbullet.SuspendLayout();\r
             this.tabPageDebug.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
@@ -140,13 +165,14 @@ namespace KancolleSniffer
             // \r
             this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
             | System.Windows.Forms.AnchorStyles.Left)));\r
-            this.tabControl.Controls.Add(this.tabPageShow);\r
+            this.tabControl.Controls.Add(this.tabPageWindow);\r
             this.tabControl.Controls.Add(this.tabPageNotification);\r
             this.tabControl.Controls.Add(this.tabPageAchievement);\r
             this.tabControl.Controls.Add(this.tabPageSound);\r
             this.tabControl.Controls.Add(this.tabPageVersion);\r
             this.tabControl.Controls.Add(this.tabPageProxy);\r
             this.tabControl.Controls.Add(this.tabPageLog);\r
+            this.tabControl.Controls.Add(this.tabPagePush);\r
             this.tabControl.Controls.Add(this.tabPageDebug);\r
             this.tabControl.Location = new System.Drawing.Point(7, 6);\r
             this.tabControl.Multiline = true;\r
@@ -155,17 +181,127 @@ namespace KancolleSniffer
             this.tabControl.Size = new System.Drawing.Size(264, 202);\r
             this.tabControl.TabIndex = 0;\r
             // \r
-            // tabPageShow\r
+            // tabPageWindow\r
+            // \r
+            this.tabPageWindow.Controls.Add(this.label18);\r
+            this.tabPageWindow.Controls.Add(this.label17);\r
+            this.tabPageWindow.Controls.Add(this.label8);\r
+            this.tabPageWindow.Controls.Add(this.numericUpDownQuest);\r
+            this.tabPageWindow.Controls.Add(this.checkBoxLocationPerMachine);\r
+            this.tabPageWindow.Controls.Add(this.checkBoxExitSilently);\r
+            this.tabPageWindow.Controls.Add(this.label15);\r
+            this.tabPageWindow.Controls.Add(this.comboBoxZoom);\r
+            this.tabPageWindow.Controls.Add(this.label14);\r
+            this.tabPageWindow.Controls.Add(this.checkBoxHideOnMinimized);\r
+            this.tabPageWindow.Controls.Add(this.checkBoxTopMost);\r
+            this.tabPageWindow.Location = new System.Drawing.Point(4, 40);\r
+            this.tabPageWindow.Name = "tabPageWindow";\r
+            this.tabPageWindow.Padding = new System.Windows.Forms.Padding(8);\r
+            this.tabPageWindow.Size = new System.Drawing.Size(256, 158);\r
+            this.tabPageWindow.TabIndex = 0;\r
+            this.tabPageWindow.Text = "ウィンドウ";\r
+            this.tabPageWindow.UseVisualStyleBackColor = true;\r
+            // \r
+            // label18\r
+            // \r
+            this.label18.AutoSize = true;\r
+            this.label18.Location = new System.Drawing.Point(121, 127);\r
+            this.label18.Name = "label18";\r
+            this.label18.Size = new System.Drawing.Size(11, 12);\r
+            this.label18.TabIndex = 12;\r
+            this.label18.Text = "*";\r
+            // \r
+            // label17\r
+            // \r
+            this.label17.AutoSize = true;\r
+            this.label17.Location = new System.Drawing.Point(186, 138);\r
+            this.label17.Name = "label17";\r
+            this.label17.Size = new System.Drawing.Size(59, 12);\r
+            this.label17.TabIndex = 11;\r
+            this.label17.Text = "*要再起動";\r
+            // \r
+            // label8\r
+            // \r
+            this.label8.AutoSize = true;\r
+            this.label8.Location = new System.Drawing.Point(11, 130);\r
+            this.label8.Name = "label8";\r
+            this.label8.Size = new System.Drawing.Size(75, 12);\r
+            this.label8.TabIndex = 10;\r
+            this.label8.Text = "任務欄の行数";\r
+            // \r
+            // numericUpDownQuest\r
+            // \r
+            this.numericUpDownQuest.Location = new System.Drawing.Point(87, 127);\r
+            this.numericUpDownQuest.Maximum = new decimal(new int[] {\r
+            7,\r
+            0,\r
+            0,\r
+            0});\r
+            this.numericUpDownQuest.Minimum = new decimal(new int[] {\r
+            4,\r
+            0,\r
+            0,\r
+            0});\r
+            this.numericUpDownQuest.Name = "numericUpDownQuest";\r
+            this.numericUpDownQuest.Size = new System.Drawing.Size(32, 19);\r
+            this.numericUpDownQuest.TabIndex = 9;\r
+            this.numericUpDownQuest.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;\r
+            this.numericUpDownQuest.Value = new decimal(new int[] {\r
+            6,\r
+            0,\r
+            0,\r
+            0});\r
             // \r
-            this.tabPageShow.Controls.Add(this.checkBoxHideOnMinimized);\r
-            this.tabPageShow.Controls.Add(this.checkBoxTopMost);\r
-            this.tabPageShow.Location = new System.Drawing.Point(4, 40);\r
-            this.tabPageShow.Name = "tabPageShow";\r
-            this.tabPageShow.Padding = new System.Windows.Forms.Padding(8);\r
-            this.tabPageShow.Size = new System.Drawing.Size(256, 158);\r
-            this.tabPageShow.TabIndex = 0;\r
-            this.tabPageShow.Text = "表示";\r
-            this.tabPageShow.UseVisualStyleBackColor = true;\r
+            // checkBoxLocationPerMachine\r
+            // \r
+            this.checkBoxLocationPerMachine.AutoSize = true;\r
+            this.checkBoxLocationPerMachine.Location = new System.Drawing.Point(11, 74);\r
+            this.checkBoxLocationPerMachine.Name = "checkBoxLocationPerMachine";\r
+            this.checkBoxLocationPerMachine.Size = new System.Drawing.Size(188, 16);\r
+            this.checkBoxLocationPerMachine.TabIndex = 8;\r
+            this.checkBoxLocationPerMachine.Text = "コンピューターごとに位置を保存する";\r
+            this.checkBoxLocationPerMachine.UseVisualStyleBackColor = true;\r
+            // \r
+            // checkBoxExitSilently\r
+            // \r
+            this.checkBoxExitSilently.AutoSize = true;\r
+            this.checkBoxExitSilently.Location = new System.Drawing.Point(11, 53);\r
+            this.checkBoxExitSilently.Name = "checkBoxExitSilently";\r
+            this.checkBoxExitSilently.Size = new System.Drawing.Size(189, 16);\r
+            this.checkBoxExitSilently.TabIndex = 7;\r
+            this.checkBoxExitSilently.Text = "閉じるボタンで終了時に確認しない";\r
+            this.checkBoxExitSilently.UseVisualStyleBackColor = true;\r
+            // \r
+            // label15\r
+            // \r
+            this.label15.AutoSize = true;\r
+            this.label15.Location = new System.Drawing.Point(99, 98);\r
+            this.label15.Name = "label15";\r
+            this.label15.Size = new System.Drawing.Size(11, 12);\r
+            this.label15.TabIndex = 6;\r
+            this.label15.Text = "*";\r
+            // \r
+            // comboBoxZoom\r
+            // \r
+            this.comboBoxZoom.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.comboBoxZoom.FormattingEnabled = true;\r
+            this.comboBoxZoom.Items.AddRange(new object[] {\r
+            "100%",\r
+            "125%",\r
+            "150%"});\r
+            this.comboBoxZoom.Location = new System.Drawing.Point(49, 97);\r
+            this.comboBoxZoom.Name = "comboBoxZoom";\r
+            this.comboBoxZoom.Size = new System.Drawing.Size(48, 20);\r
+            this.comboBoxZoom.TabIndex = 5;\r
+            // \r
+            // label14\r
+            // \r
+            this.label14.AutoSize = true;\r
+            this.label14.Location = new System.Drawing.Point(11, 100);\r
+            this.label14.Name = "label14";\r
+            this.label14.Size = new System.Drawing.Size(35, 12);\r
+            this.label14.TabIndex = 4;\r
+            this.label14.Text = "ズーム";\r
             // \r
             // checkBoxHideOnMinimized\r
             // \r
@@ -189,6 +325,8 @@ namespace KancolleSniffer
             // \r
             // tabPageNotification\r
             // \r
+            this.tabPageNotification.Controls.Add(this.checkBoxRepeat);\r
+            this.tabPageNotification.Controls.Add(this.buttonDetailedSettings);\r
             this.tabPageNotification.Controls.Add(this.label6);\r
             this.tabPageNotification.Controls.Add(this.checkBoxCond49);\r
             this.tabPageNotification.Controls.Add(this.checkBoxCond40);\r
@@ -209,19 +347,39 @@ namespace KancolleSniffer
             this.tabPageNotification.Text = "通知";\r
             this.tabPageNotification.UseVisualStyleBackColor = true;\r
             // \r
+            // checkBoxRepeat\r
+            // \r
+            this.checkBoxRepeat.AutoSize = true;\r
+            this.checkBoxRepeat.Location = new System.Drawing.Point(122, 32);\r
+            this.checkBoxRepeat.Name = "checkBoxRepeat";\r
+            this.checkBoxRepeat.Size = new System.Drawing.Size(58, 16);\r
+            this.checkBoxRepeat.TabIndex = 27;\r
+            this.checkBoxRepeat.Text = "リピート";\r
+            this.checkBoxRepeat.UseVisualStyleBackColor = true;\r
+            // \r
+            // buttonDetailedSettings\r
+            // \r
+            this.buttonDetailedSettings.Location = new System.Drawing.Point(11, 122);\r
+            this.buttonDetailedSettings.Name = "buttonDetailedSettings";\r
+            this.buttonDetailedSettings.Size = new System.Drawing.Size(75, 23);\r
+            this.buttonDetailedSettings.TabIndex = 26;\r
+            this.buttonDetailedSettings.Text = "詳細設定...";\r
+            this.buttonDetailedSettings.UseVisualStyleBackColor = true;\r
+            this.buttonDetailedSettings.Click += new System.EventHandler(this.buttonDetailedSettings_Click);\r
+            // \r
             // label6\r
             // \r
             this.label6.AutoSize = true;\r
-            this.label6.Location = new System.Drawing.Point(9, 119);\r
+            this.label6.Location = new System.Drawing.Point(159, 61);\r
             this.label6.Name = "label6";\r
-            this.label6.Size = new System.Drawing.Size(105, 12);\r
+            this.label6.Size = new System.Drawing.Size(86, 12);\r
             this.label6.TabIndex = 25;\r
-            this.label6.Text = "疲労回復を通知する";\r
+            this.label6.Text = "疲労回復を通知";\r
             // \r
             // checkBoxCond49\r
             // \r
             this.checkBoxCond49.AutoSize = true;\r
-            this.checkBoxCond49.Location = new System.Drawing.Point(180, 118);\r
+            this.checkBoxCond49.Location = new System.Drawing.Point(161, 97);\r
             this.checkBoxCond49.Name = "checkBoxCond49";\r
             this.checkBoxCond49.Size = new System.Drawing.Size(60, 16);\r
             this.checkBoxCond49.TabIndex = 24;\r
@@ -231,7 +389,7 @@ namespace KancolleSniffer
             // checkBoxCond40\r
             // \r
             this.checkBoxCond40.AutoSize = true;\r
-            this.checkBoxCond40.Location = new System.Drawing.Point(118, 118);\r
+            this.checkBoxCond40.Location = new System.Drawing.Point(161, 78);\r
             this.checkBoxCond40.Name = "checkBoxCond40";\r
             this.checkBoxCond40.Size = new System.Drawing.Size(60, 16);\r
             this.checkBoxCond40.TabIndex = 23;\r
@@ -241,15 +399,15 @@ namespace KancolleSniffer
             // label5\r
             // \r
             this.label5.AutoSize = true;\r
-            this.label5.Location = new System.Drawing.Point(118, 96);\r
+            this.label5.Location = new System.Drawing.Point(95, 81);\r
             this.label5.Name = "label5";\r
-            this.label5.Size = new System.Drawing.Size(70, 12);\r
+            this.label5.Size = new System.Drawing.Size(51, 12);\r
             this.label5.TabIndex = 22;\r
-            this.label5.Text = "個で通知する";\r
+            this.label5.Text = "個で通知";\r
             // \r
             // numericUpDownMarginEquips\r
             // \r
-            this.numericUpDownMarginEquips.Location = new System.Drawing.Point(81, 94);\r
+            this.numericUpDownMarginEquips.Location = new System.Drawing.Point(58, 79);\r
             this.numericUpDownMarginEquips.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);\r
             this.numericUpDownMarginEquips.Maximum = new decimal(new int[] {\r
             99,\r
@@ -264,7 +422,7 @@ namespace KancolleSniffer
             // label4\r
             // \r
             this.label4.AutoSize = true;\r
-            this.label4.Location = new System.Drawing.Point(52, 96);\r
+            this.label4.Location = new System.Drawing.Point(29, 81);\r
             this.label4.Name = "label4";\r
             this.label4.Size = new System.Drawing.Size(29, 12);\r
             this.label4.TabIndex = 20;\r
@@ -272,7 +430,7 @@ namespace KancolleSniffer
             // \r
             // numericUpDownMarginShips\r
             // \r
-            this.numericUpDownMarginShips.Location = new System.Drawing.Point(80, 74);\r
+            this.numericUpDownMarginShips.Location = new System.Drawing.Point(57, 59);\r
             this.numericUpDownMarginShips.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);\r
             this.numericUpDownMarginShips.Maximum = new decimal(new int[] {\r
             99,\r
@@ -287,7 +445,7 @@ namespace KancolleSniffer
             // label2\r
             // \r
             this.label2.AutoSize = true;\r
-            this.label2.Location = new System.Drawing.Point(118, 76);\r
+            this.label2.Location = new System.Drawing.Point(95, 61);\r
             this.label2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);\r
             this.label2.Name = "label2";\r
             this.label2.Size = new System.Drawing.Size(17, 12);\r
@@ -297,20 +455,20 @@ namespace KancolleSniffer
             // label1\r
             // \r
             this.label1.AutoSize = true;\r
-            this.label1.Location = new System.Drawing.Point(9, 76);\r
+            this.label1.Location = new System.Drawing.Point(9, 61);\r
             this.label1.Name = "label1";\r
-            this.label1.Size = new System.Drawing.Size(72, 12);\r
+            this.label1.Size = new System.Drawing.Size(49, 12);\r
             this.label1.TabIndex = 17;\r
-            this.label1.Text = "上限まで艦娘";\r
+            this.label1.Text = "残り艦娘";\r
             // \r
             // checkBoxSound\r
             // \r
             this.checkBoxSound.AutoSize = true;\r
-            this.checkBoxSound.Location = new System.Drawing.Point(11, 53);\r
+            this.checkBoxSound.Location = new System.Drawing.Point(122, 11);\r
             this.checkBoxSound.Name = "checkBoxSound";\r
-            this.checkBoxSound.Size = new System.Drawing.Size(113, 16);\r
+            this.checkBoxSound.Size = new System.Drawing.Size(94, 16);\r
             this.checkBoxSound.TabIndex = 16;\r
-            this.checkBoxSound.Text = "サウンドを再生する";\r
+            this.checkBoxSound.Text = "サウンドを再生";\r
             this.checkBoxSound.UseVisualStyleBackColor = true;\r
             // \r
             // checkBoxBalloon\r
@@ -318,9 +476,9 @@ namespace KancolleSniffer
             this.checkBoxBalloon.AutoSize = true;\r
             this.checkBoxBalloon.Location = new System.Drawing.Point(11, 32);\r
             this.checkBoxBalloon.Name = "checkBoxBalloon";\r
-            this.checkBoxBalloon.Size = new System.Drawing.Size(172, 16);\r
+            this.checkBoxBalloon.Size = new System.Drawing.Size(105, 16);\r
             this.checkBoxBalloon.TabIndex = 15;\r
-            this.checkBoxBalloon.Text = "通知領域にバルーンを表示する";\r
+            this.checkBoxBalloon.Text = "通知領域に表示";\r
             this.checkBoxBalloon.UseVisualStyleBackColor = true;\r
             // \r
             // checkBoxFlash\r
@@ -328,13 +486,15 @@ namespace KancolleSniffer
             this.checkBoxFlash.AutoSize = true;\r
             this.checkBoxFlash.Location = new System.Drawing.Point(11, 11);\r
             this.checkBoxFlash.Name = "checkBoxFlash";\r
-            this.checkBoxFlash.Size = new System.Drawing.Size(127, 16);\r
+            this.checkBoxFlash.Size = new System.Drawing.Size(100, 16);\r
             this.checkBoxFlash.TabIndex = 14;\r
-            this.checkBoxFlash.Text = "ウィンドウを点滅させる";\r
+            this.checkBoxFlash.Text = "ウィンドウを点滅";\r
             this.checkBoxFlash.UseVisualStyleBackColor = true;\r
             // \r
             // tabPageAchievement\r
             // \r
+            this.tabPageAchievement.Controls.Add(this.checkBoxWarnBadDamageWithDamecon);\r
+            this.tabPageAchievement.Controls.Add(this.checkBoxPresetAkashi);\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
@@ -345,49 +505,89 @@ namespace KancolleSniffer
             this.tabPageAchievement.Text = "機能";\r
             this.tabPageAchievement.UseVisualStyleBackColor = true;\r
             // \r
+            // checkBoxWarnBadDamageWithDamecon\r
+            // \r
+            this.checkBoxWarnBadDamageWithDamecon.AutoSize = true;\r
+            this.checkBoxWarnBadDamageWithDamecon.Location = new System.Drawing.Point(20, 114);\r
+            this.checkBoxWarnBadDamageWithDamecon.Name = "checkBoxWarnBadDamageWithDamecon";\r
+            this.checkBoxWarnBadDamageWithDamecon.Size = new System.Drawing.Size(168, 16);\r
+            this.checkBoxWarnBadDamageWithDamecon.TabIndex = 20;\r
+            this.checkBoxWarnBadDamageWithDamecon.Text = "ダメコン装備でも大破警告する";\r
+            this.checkBoxWarnBadDamageWithDamecon.UseVisualStyleBackColor = true;\r
+            // \r
+            // checkBoxPresetAkashi\r
+            // \r
+            this.checkBoxPresetAkashi.AutoSize = true;\r
+            this.checkBoxPresetAkashi.Location = new System.Drawing.Point(20, 135);\r
+            this.checkBoxPresetAkashi.Name = "checkBoxPresetAkashi";\r
+            this.checkBoxPresetAkashi.Size = new System.Drawing.Size(141, 16);\r
+            this.checkBoxPresetAkashi.TabIndex = 19;\r
+            this.checkBoxPresetAkashi.Text = "プリセット明石修理を使う";\r
+            this.checkBoxPresetAkashi.UseVisualStyleBackColor = true;\r
+            // \r
             // groupBox3\r
             // \r
-            this.groupBox3.Controls.Add(this.radioButtonResultRankWhenClick);\r
-            this.groupBox3.Controls.Add(this.radioButtonResultRankAlways);\r
-            this.groupBox3.Location = new System.Drawing.Point(11, 65);\r
+            this.groupBox3.Controls.Add(this.checkBoxNextCell);\r
+            this.groupBox3.Controls.Add(this.checkBoxBattleResult);\r
+            this.groupBox3.Controls.Add(this.checkBoxAirBattleResult);\r
+            this.groupBox3.Controls.Add(this.checkBoxResultRank);\r
+            this.groupBox3.Location = new System.Drawing.Point(11, 59);\r
             this.groupBox3.Name = "groupBox3";\r
             this.groupBox3.Padding = new System.Windows.Forms.Padding(6);\r
-            this.groupBox3.Size = new System.Drawing.Size(234, 48);\r
+            this.groupBox3.Size = new System.Drawing.Size(234, 44);\r
             this.groupBox3.TabIndex = 18;\r
             this.groupBox3.TabStop = false;\r
-            this.groupBox3.Text = "勝利判定の表示";\r
-            // \r
-            // radioButtonResultRankWhenClick\r
-            // \r
-            this.radioButtonResultRankWhenClick.AutoSize = true;\r
-            this.radioButtonResultRankWhenClick.Location = new System.Drawing.Point(59, 21);\r
-            this.radioButtonResultRankWhenClick.Name = "radioButtonResultRankWhenClick";\r
-            this.radioButtonResultRankWhenClick.Size = new System.Drawing.Size(88, 16);\r
-            this.radioButtonResultRankWhenClick.TabIndex = 1;\r
-            this.radioButtonResultRankWhenClick.TabStop = true;\r
-            this.radioButtonResultRankWhenClick.Text = "クリックしたとき";\r
-            this.radioButtonResultRankWhenClick.UseVisualStyleBackColor = true;\r
-            // \r
-            // radioButtonResultRankAlways\r
-            // \r
-            this.radioButtonResultRankAlways.AutoSize = true;\r
-            this.radioButtonResultRankAlways.Location = new System.Drawing.Point(9, 21);\r
-            this.radioButtonResultRankAlways.Name = "radioButtonResultRankAlways";\r
-            this.radioButtonResultRankAlways.Size = new System.Drawing.Size(44, 16);\r
-            this.radioButtonResultRankAlways.TabIndex = 0;\r
-            this.radioButtonResultRankAlways.TabStop = true;\r
-            this.radioButtonResultRankAlways.Text = "常に";\r
-            this.radioButtonResultRankAlways.UseVisualStyleBackColor = true;\r
+            this.groupBox3.Text = "ネタバレ";\r
+            // \r
+            // checkBoxNextCell\r
+            // \r
+            this.checkBoxNextCell.AutoSize = true;\r
+            this.checkBoxNextCell.Location = new System.Drawing.Point(174, 18);\r
+            this.checkBoxNextCell.Name = "checkBoxNextCell";\r
+            this.checkBoxNextCell.Size = new System.Drawing.Size(48, 16);\r
+            this.checkBoxNextCell.TabIndex = 3;\r
+            this.checkBoxNextCell.Text = "進路";\r
+            this.checkBoxNextCell.UseVisualStyleBackColor = true;\r
+            // \r
+            // checkBoxBattleResult\r
+            // \r
+            this.checkBoxBattleResult.AutoSize = true;\r
+            this.checkBoxBattleResult.Location = new System.Drawing.Point(123, 18);\r
+            this.checkBoxBattleResult.Name = "checkBoxBattleResult";\r
+            this.checkBoxBattleResult.Size = new System.Drawing.Size(48, 16);\r
+            this.checkBoxBattleResult.TabIndex = 2;\r
+            this.checkBoxBattleResult.Text = "戦況";\r
+            this.checkBoxBattleResult.UseVisualStyleBackColor = true;\r
+            // \r
+            // checkBoxAirBattleResult\r
+            // \r
+            this.checkBoxAirBattleResult.AutoSize = true;\r
+            this.checkBoxAirBattleResult.Location = new System.Drawing.Point(60, 18);\r
+            this.checkBoxAirBattleResult.Name = "checkBoxAirBattleResult";\r
+            this.checkBoxAirBattleResult.Size = new System.Drawing.Size(60, 16);\r
+            this.checkBoxAirBattleResult.TabIndex = 1;\r
+            this.checkBoxAirBattleResult.Text = "航空戦";\r
+            this.checkBoxAirBattleResult.UseVisualStyleBackColor = true;\r
+            // \r
+            // checkBoxResultRank\r
+            // \r
+            this.checkBoxResultRank.AutoSize = true;\r
+            this.checkBoxResultRank.Location = new System.Drawing.Point(9, 18);\r
+            this.checkBoxResultRank.Name = "checkBoxResultRank";\r
+            this.checkBoxResultRank.Size = new System.Drawing.Size(48, 16);\r
+            this.checkBoxResultRank.TabIndex = 0;\r
+            this.checkBoxResultRank.Text = "勝敗";\r
+            this.checkBoxResultRank.UseVisualStyleBackColor = true;\r
             // \r
             // groupBox2\r
             // \r
             this.groupBox2.Controls.Add(this.checkBoxReset02);\r
             this.groupBox2.Controls.Add(this.buttonResetAchievement);\r
             this.groupBox2.Controls.Add(this.checkBoxReset14);\r
-            this.groupBox2.Location = new System.Drawing.Point(11, 11);\r
+            this.groupBox2.Location = new System.Drawing.Point(11, 10);\r
             this.groupBox2.Name = "groupBox2";\r
             this.groupBox2.Padding = new System.Windows.Forms.Padding(6);\r
-            this.groupBox2.Size = new System.Drawing.Size(234, 48);\r
+            this.groupBox2.Size = new System.Drawing.Size(234, 44);\r
             this.groupBox2.TabIndex = 17;\r
             this.groupBox2.TabStop = false;\r
             this.groupBox2.Text = "戦果のリセット";\r
@@ -395,7 +595,7 @@ namespace KancolleSniffer
             // checkBoxReset02\r
             // \r
             this.checkBoxReset02.AutoSize = true;\r
-            this.checkBoxReset02.Location = new System.Drawing.Point(9, 21);\r
+            this.checkBoxReset02.Location = new System.Drawing.Point(9, 18);\r
             this.checkBoxReset02.Name = "checkBoxReset02";\r
             this.checkBoxReset02.Size = new System.Drawing.Size(42, 16);\r
             this.checkBoxReset02.TabIndex = 13;\r
@@ -404,7 +604,7 @@ namespace KancolleSniffer
             // \r
             // buttonResetAchievement\r
             // \r
-            this.buttonResetAchievement.Location = new System.Drawing.Point(111, 18);\r
+            this.buttonResetAchievement.Location = new System.Drawing.Point(111, 15);\r
             this.buttonResetAchievement.Name = "buttonResetAchievement";\r
             this.buttonResetAchievement.Size = new System.Drawing.Size(44, 20);\r
             this.buttonResetAchievement.TabIndex = 16;\r
@@ -415,7 +615,7 @@ namespace KancolleSniffer
             // checkBoxReset14\r
             // \r
             this.checkBoxReset14.AutoSize = true;\r
-            this.checkBoxReset14.Location = new System.Drawing.Point(57, 21);\r
+            this.checkBoxReset14.Location = new System.Drawing.Point(57, 18);\r
             this.checkBoxReset14.Name = "checkBoxReset14";\r
             this.checkBoxReset14.Size = new System.Drawing.Size(48, 16);\r
             this.checkBoxReset14.TabIndex = 14;\r
@@ -497,7 +697,7 @@ namespace KancolleSniffer
             // tabPageVersion\r
             // \r
             this.tabPageVersion.Controls.Add(this.richTextBox1);\r
-            this.tabPageVersion.Controls.Add(this.label7);\r
+            this.tabPageVersion.Controls.Add(this.labelCopyright);\r
             this.tabPageVersion.Controls.Add(this.linkLabelProductName);\r
             this.tabPageVersion.Controls.Add(this.labelVersion);\r
             this.tabPageVersion.Controls.Add(this.labelLatest);\r
@@ -506,7 +706,7 @@ namespace KancolleSniffer
             this.tabPageVersion.Padding = new System.Windows.Forms.Padding(8);\r
             this.tabPageVersion.Size = new System.Drawing.Size(256, 158);\r
             this.tabPageVersion.TabIndex = 4;\r
-            this.tabPageVersion.Text = "バージョン情報";\r
+            this.tabPageVersion.Text = "バージョン";\r
             this.tabPageVersion.UseVisualStyleBackColor = true;\r
             // \r
             // richTextBox1\r
@@ -516,18 +716,16 @@ namespace KancolleSniffer
             this.richTextBox1.Location = new System.Drawing.Point(11, 62);\r
             this.richTextBox1.Name = "richTextBox1";\r
             this.richTextBox1.ReadOnly = true;\r
-            this.richTextBox1.Size = new System.Drawing.Size(208, 50);\r
+            this.richTextBox1.Size = new System.Drawing.Size(234, 32);\r
             this.richTextBox1.TabIndex = 15;\r
-            this.richTextBox1.Text = "このソフトウェアは一部のファイルを除き\nGNU GPLバージョン3でライセンスされます。\n詳細はREADME.mdを参照してください。";\r
+            this.richTextBox1.Text = "このソフトウェアはApache Licenseバージョン2.0でライセンスします。";\r
             // \r
-            // label7\r
+            // labelCopyright\r
             // \r
-            this.label7.AutoSize = true;\r
-            this.label7.Location = new System.Drawing.Point(11, 35);\r
-            this.label7.Name = "label7";\r
-            this.label7.Size = new System.Drawing.Size(212, 12);\r
-            this.label7.TabIndex = 13;\r
-            this.label7.Text = "Copyright © 2013-2015 Kazuhiro Fujieda";\r
+            this.labelCopyright.Location = new System.Drawing.Point(11, 35);\r
+            this.labelCopyright.Name = "labelCopyright";\r
+            this.labelCopyright.Size = new System.Drawing.Size(212, 12);\r
+            this.labelCopyright.TabIndex = 13;\r
             // \r
             // linkLabelProductName\r
             // \r
@@ -545,14 +743,14 @@ namespace KancolleSniffer
             this.labelVersion.AutoSize = true;\r
             this.labelVersion.Location = new System.Drawing.Point(92, 11);\r
             this.labelVersion.Name = "labelVersion";\r
-            this.labelVersion.Size = new System.Drawing.Size(70, 12);\r
+            this.labelVersion.Size = new System.Drawing.Size(50, 12);\r
             this.labelVersion.TabIndex = 10;\r
-            this.labelVersion.Text = "バージョン4.10";\r
+            this.labelVersion.Text = "バージョン";\r
             // \r
             // labelLatest\r
             // \r
             this.labelLatest.AutoSize = true;\r
-            this.labelLatest.Location = new System.Drawing.Point(161, 11);\r
+            this.labelLatest.Location = new System.Drawing.Point(167, 11);\r
             this.labelLatest.Name = "labelLatest";\r
             this.labelLatest.Size = new System.Drawing.Size(49, 12);\r
             this.labelLatest.TabIndex = 11;\r
@@ -561,8 +759,7 @@ namespace KancolleSniffer
             // tabPageProxy\r
             // \r
             this.tabPageProxy.Controls.Add(this.groupBoxUpstream);\r
-            this.tabPageProxy.Controls.Add(this.textBoxListen);\r
-            this.tabPageProxy.Controls.Add(this.labelListen);\r
+            this.tabPageProxy.Controls.Add(this.groupBoxAutoConfig);\r
             this.tabPageProxy.Location = new System.Drawing.Point(4, 40);\r
             this.tabPageProxy.Name = "tabPageProxy";\r
             this.tabPageProxy.Padding = new System.Windows.Forms.Padding(8);\r
@@ -577,7 +774,7 @@ namespace KancolleSniffer
             this.groupBoxUpstream.Controls.Add(this.radioButtonUpstreamOn);\r
             this.groupBoxUpstream.Controls.Add(this.textBoxPort);\r
             this.groupBoxUpstream.Controls.Add(this.labelPort);\r
-            this.groupBoxUpstream.Location = new System.Drawing.Point(11, 41);\r
+            this.groupBoxUpstream.Location = new System.Drawing.Point(11, 65);\r
             this.groupBoxUpstream.Name = "groupBoxUpstream";\r
             this.groupBoxUpstream.Size = new System.Drawing.Size(234, 48);\r
             this.groupBoxUpstream.TabIndex = 3;\r
@@ -622,9 +819,42 @@ namespace KancolleSniffer
             this.labelPort.TabIndex = 2;\r
             this.labelPort.Text = "送信ポート:";\r
             // \r
+            // groupBoxAutoConfig\r
+            // \r
+            this.groupBoxAutoConfig.Controls.Add(this.radioButtonAutoConfigOff);\r
+            this.groupBoxAutoConfig.Controls.Add(this.radioButtonAutoConfigOn);\r
+            this.groupBoxAutoConfig.Controls.Add(this.textBoxListen);\r
+            this.groupBoxAutoConfig.Controls.Add(this.labelListen);\r
+            this.groupBoxAutoConfig.Location = new System.Drawing.Point(11, 11);\r
+            this.groupBoxAutoConfig.Name = "groupBoxAutoConfig";\r
+            this.groupBoxAutoConfig.Size = new System.Drawing.Size(234, 48);\r
+            this.groupBoxAutoConfig.TabIndex = 2;\r
+            this.groupBoxAutoConfig.TabStop = false;\r
+            this.groupBoxAutoConfig.Text = "自動設定";\r
+            // \r
+            // radioButtonAutoConfigOff\r
+            // \r
+            this.radioButtonAutoConfigOff.AutoSize = true;\r
+            this.radioButtonAutoConfigOff.Location = new System.Drawing.Point(59, 19);\r
+            this.radioButtonAutoConfigOff.Name = "radioButtonAutoConfigOff";\r
+            this.radioButtonAutoConfigOff.Size = new System.Drawing.Size(47, 16);\r
+            this.radioButtonAutoConfigOff.TabIndex = 1;\r
+            this.radioButtonAutoConfigOff.Text = "無効";\r
+            this.radioButtonAutoConfigOff.UseVisualStyleBackColor = true;\r
+            // \r
+            // radioButtonAutoConfigOn\r
+            // \r
+            this.radioButtonAutoConfigOn.AutoSize = true;\r
+            this.radioButtonAutoConfigOn.Location = new System.Drawing.Point(6, 19);\r
+            this.radioButtonAutoConfigOn.Name = "radioButtonAutoConfigOn";\r
+            this.radioButtonAutoConfigOn.Size = new System.Drawing.Size(47, 16);\r
+            this.radioButtonAutoConfigOn.TabIndex = 0;\r
+            this.radioButtonAutoConfigOn.Text = "有効";\r
+            this.radioButtonAutoConfigOn.UseVisualStyleBackColor = true;\r
+            // \r
             // textBoxListen\r
             // \r
-            this.textBoxListen.Location = new System.Drawing.Point(72, 16);\r
+            this.textBoxListen.Location = new System.Drawing.Point(175, 18);\r
             this.textBoxListen.Name = "textBoxListen";\r
             this.textBoxListen.Size = new System.Drawing.Size(36, 19);\r
             this.textBoxListen.TabIndex = 3;\r
@@ -633,7 +863,7 @@ namespace KancolleSniffer
             // labelListen\r
             // \r
             this.labelListen.AutoSize = true;\r
-            this.labelListen.Location = new System.Drawing.Point(11, 19);\r
+            this.labelListen.Location = new System.Drawing.Point(114, 21);\r
             this.labelListen.Name = "labelListen";\r
             this.labelListen.Size = new System.Drawing.Size(59, 12);\r
             this.labelListen.TabIndex = 2;\r
@@ -641,7 +871,6 @@ namespace KancolleSniffer
             // \r
             // tabPageLog\r
             // \r
-            this.tabPageLog.Controls.Add(this.groupBox1);\r
             this.tabPageLog.Controls.Add(this.label10);\r
             this.tabPageLog.Controls.Add(this.checkBoxOutput);\r
             this.tabPageLog.Controls.Add(this.label9);\r
@@ -657,58 +886,6 @@ namespace KancolleSniffer
             this.tabPageLog.Text = "報告書";\r
             this.tabPageLog.UseVisualStyleBackColor = true;\r
             // \r
-            // groupBox1\r
-            // \r
-            this.groupBox1.Controls.Add(this.radioButtonServerOff);\r
-            this.groupBox1.Controls.Add(this.radioButtonServerOn);\r
-            this.groupBox1.Controls.Add(this.textBoxServer);\r
-            this.groupBox1.Controls.Add(this.label12);\r
-            this.groupBox1.Location = new System.Drawing.Point(11, 83);\r
-            this.groupBox1.Name = "groupBox1";\r
-            this.groupBox1.Size = new System.Drawing.Size(234, 48);\r
-            this.groupBox1.TabIndex = 15;\r
-            this.groupBox1.TabStop = false;\r
-            this.groupBox1.Text = "閲覧サーバー";\r
-            // \r
-            // radioButtonServerOff\r
-            // \r
-            this.radioButtonServerOff.AutoSize = true;\r
-            this.radioButtonServerOff.Location = new System.Drawing.Point(59, 18);\r
-            this.radioButtonServerOff.Name = "radioButtonServerOff";\r
-            this.radioButtonServerOff.Size = new System.Drawing.Size(47, 16);\r
-            this.radioButtonServerOff.TabIndex = 10;\r
-            this.radioButtonServerOff.TabStop = true;\r
-            this.radioButtonServerOff.Text = "無効";\r
-            this.radioButtonServerOff.UseVisualStyleBackColor = true;\r
-            // \r
-            // radioButtonServerOn\r
-            // \r
-            this.radioButtonServerOn.AutoSize = true;\r
-            this.radioButtonServerOn.Location = new System.Drawing.Point(6, 18);\r
-            this.radioButtonServerOn.Name = "radioButtonServerOn";\r
-            this.radioButtonServerOn.Size = new System.Drawing.Size(47, 16);\r
-            this.radioButtonServerOn.TabIndex = 9;\r
-            this.radioButtonServerOn.TabStop = true;\r
-            this.radioButtonServerOn.Text = "有効";\r
-            this.radioButtonServerOn.UseVisualStyleBackColor = true;\r
-            this.radioButtonServerOn.CheckedChanged += new System.EventHandler(this.radioButtonServerOn_CheckedChanged);\r
-            // \r
-            // textBoxServer\r
-            // \r
-            this.textBoxServer.Location = new System.Drawing.Point(175, 17);\r
-            this.textBoxServer.Name = "textBoxServer";\r
-            this.textBoxServer.Size = new System.Drawing.Size(36, 19);\r
-            this.textBoxServer.TabIndex = 11;\r
-            // \r
-            // label12\r
-            // \r
-            this.label12.AutoSize = true;\r
-            this.label12.Location = new System.Drawing.Point(114, 20);\r
-            this.label12.Name = "label12";\r
-            this.label12.Size = new System.Drawing.Size(59, 12);\r
-            this.label12.TabIndex = 8;\r
-            this.label12.Text = "受信ポート:";\r
-            // \r
             // label10\r
             // \r
             this.label10.AutoSize = true;\r
@@ -771,6 +948,135 @@ namespace KancolleSniffer
             this.buttonOutputDir.UseVisualStyleBackColor = true;\r
             this.buttonOutputDir.Click += new System.EventHandler(this.buttonOutputDir_Click);\r
             // \r
+            // tabPagePush\r
+            // \r
+            this.tabPagePush.Controls.Add(this.groupBoxPushover);\r
+            this.tabPagePush.Controls.Add(this.groupBoxPushbullet);\r
+            this.tabPagePush.Location = new System.Drawing.Point(4, 40);\r
+            this.tabPagePush.Name = "tabPagePush";\r
+            this.tabPagePush.Size = new System.Drawing.Size(256, 158);\r
+            this.tabPagePush.TabIndex = 8;\r
+            this.tabPagePush.Text = "プッシュ通知";\r
+            this.tabPagePush.UseVisualStyleBackColor = true;\r
+            // \r
+            // groupBoxPushover\r
+            // \r
+            this.groupBoxPushover.Controls.Add(this.buttonPushoverTest);\r
+            this.groupBoxPushover.Controls.Add(this.label16);\r
+            this.groupBoxPushover.Controls.Add(this.label12);\r
+            this.groupBoxPushover.Controls.Add(this.textBoxPushoverUserKey);\r
+            this.groupBoxPushover.Controls.Add(this.checkBoxPushoverOn);\r
+            this.groupBoxPushover.Controls.Add(this.textBoxPushoverApiKey);\r
+            this.groupBoxPushover.Location = new System.Drawing.Point(11, 60);\r
+            this.groupBoxPushover.Name = "groupBoxPushover";\r
+            this.groupBoxPushover.Size = new System.Drawing.Size(236, 66);\r
+            this.groupBoxPushover.TabIndex = 2;\r
+            this.groupBoxPushover.TabStop = false;\r
+            this.groupBoxPushover.Text = "Pushover";\r
+            // \r
+            // buttonPushoverTest\r
+            // \r
+            this.buttonPushoverTest.Font = new System.Drawing.Font("MS ゴシック", 9F);\r
+            this.buttonPushoverTest.Location = new System.Drawing.Point(6, 36);\r
+            this.buttonPushoverTest.Name = "buttonPushoverTest";\r
+            this.buttonPushoverTest.Size = new System.Drawing.Size(37, 23);\r
+            this.buttonPushoverTest.TabIndex = 12;\r
+            this.buttonPushoverTest.Text = "Test";\r
+            this.buttonPushoverTest.UseVisualStyleBackColor = true;\r
+            this.buttonPushoverTest.Click += new System.EventHandler(this.buttonPushoverTest_Click);\r
+            // \r
+            // label16\r
+            // \r
+            this.label16.AutoSize = true;\r
+            this.label16.Location = new System.Drawing.Point(58, 17);\r
+            this.label16.Name = "label16";\r
+            this.label16.Size = new System.Drawing.Size(48, 12);\r
+            this.label16.TabIndex = 11;\r
+            this.label16.Text = "API Key:";\r
+            // \r
+            // label12\r
+            // \r
+            this.label12.AutoSize = true;\r
+            this.label12.Location = new System.Drawing.Point(52, 41);\r
+            this.label12.Name = "label12";\r
+            this.label12.Size = new System.Drawing.Size(54, 12);\r
+            this.label12.TabIndex = 10;\r
+            this.label12.Text = "User Key:";\r
+            // \r
+            // textBoxPushoverUserKey\r
+            // \r
+            this.textBoxPushoverUserKey.Location = new System.Drawing.Point(106, 38);\r
+            this.textBoxPushoverUserKey.Name = "textBoxPushoverUserKey";\r
+            this.textBoxPushoverUserKey.Size = new System.Drawing.Size(122, 19);\r
+            this.textBoxPushoverUserKey.TabIndex = 9;\r
+            // \r
+            // checkBoxPushoverOn\r
+            // \r
+            this.checkBoxPushoverOn.AutoSize = true;\r
+            this.checkBoxPushoverOn.Location = new System.Drawing.Point(6, 16);\r
+            this.checkBoxPushoverOn.Name = "checkBoxPushoverOn";\r
+            this.checkBoxPushoverOn.Size = new System.Drawing.Size(48, 16);\r
+            this.checkBoxPushoverOn.TabIndex = 5;\r
+            this.checkBoxPushoverOn.Text = "有効";\r
+            this.checkBoxPushoverOn.UseVisualStyleBackColor = true;\r
+            // \r
+            // textBoxPushoverApiKey\r
+            // \r
+            this.textBoxPushoverApiKey.Location = new System.Drawing.Point(106, 13);\r
+            this.textBoxPushoverApiKey.Name = "textBoxPushoverApiKey";\r
+            this.textBoxPushoverApiKey.Size = new System.Drawing.Size(122, 19);\r
+            this.textBoxPushoverApiKey.TabIndex = 7;\r
+            // \r
+            // groupBoxPushbullet\r
+            // \r
+            this.groupBoxPushbullet.Controls.Add(this.buttonPushbulletTest);\r
+            this.groupBoxPushbullet.Controls.Add(this.textBoxPushbulletToken);\r
+            this.groupBoxPushbullet.Controls.Add(this.label7);\r
+            this.groupBoxPushbullet.Controls.Add(this.checkBoxPushbulletOn);\r
+            this.groupBoxPushbullet.Location = new System.Drawing.Point(11, 11);\r
+            this.groupBoxPushbullet.Name = "groupBoxPushbullet";\r
+            this.groupBoxPushbullet.Size = new System.Drawing.Size(236, 43);\r
+            this.groupBoxPushbullet.TabIndex = 1;\r
+            this.groupBoxPushbullet.TabStop = false;\r
+            this.groupBoxPushbullet.Text = "Pushbullet";\r
+            // \r
+            // buttonPushbulletTest\r
+            // \r
+            this.buttonPushbulletTest.Font = new System.Drawing.Font("MS ゴシック", 9F);\r
+            this.buttonPushbulletTest.Location = new System.Drawing.Point(193, 13);\r
+            this.buttonPushbulletTest.Name = "buttonPushbulletTest";\r
+            this.buttonPushbulletTest.Size = new System.Drawing.Size(37, 23);\r
+            this.buttonPushbulletTest.TabIndex = 3;\r
+            this.buttonPushbulletTest.Text = "Test";\r
+            this.buttonPushbulletTest.UseVisualStyleBackColor = true;\r
+            this.buttonPushbulletTest.Click += new System.EventHandler(this.buttonPushbulletTest_Click);\r
+            // \r
+            // textBoxPushbulletToken\r
+            // \r
+            this.textBoxPushbulletToken.Location = new System.Drawing.Point(91, 15);\r
+            this.textBoxPushbulletToken.Name = "textBoxPushbulletToken";\r
+            this.textBoxPushbulletToken.Size = new System.Drawing.Size(98, 19);\r
+            this.textBoxPushbulletToken.TabIndex = 2;\r
+            // \r
+            // label7\r
+            // \r
+            this.label7.AutoSize = true;\r
+            this.label7.Location = new System.Drawing.Point(52, 19);\r
+            this.label7.Name = "label7";\r
+            this.label7.Size = new System.Drawing.Size(38, 12);\r
+            this.label7.TabIndex = 1;\r
+            this.label7.Text = "Token:";\r
+            // \r
+            // checkBoxPushbulletOn\r
+            // \r
+            this.checkBoxPushbulletOn.AutoSize = true;\r
+            this.checkBoxPushbulletOn.Location = new System.Drawing.Point(6, 18);\r
+            this.checkBoxPushbulletOn.Name = "checkBoxPushbulletOn";\r
+            this.checkBoxPushbulletOn.Size = new System.Drawing.Size(48, 16);\r
+            this.checkBoxPushbulletOn.TabIndex = 0;\r
+            this.checkBoxPushbulletOn.Text = "有効";\r
+            this.checkBoxPushbulletOn.UseVisualStyleBackColor = true;\r
+            // \r
             // tabPageDebug\r
             // \r
             this.tabPageDebug.Controls.Add(this.buttonPlayDebugLog);\r
@@ -863,12 +1169,6 @@ namespace KancolleSniffer
     ";*.wma;*.mp2;*.mp3";\r
             this.openSoundFileDialog.Title = "オーディオファイルを選択する";\r
             // \r
-            // toolTipError\r
-            // \r
-            this.toolTipError.AutomaticDelay = 0;\r
-            this.toolTipError.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Error;\r
-            this.toolTipError.ToolTipTitle = "入力エラー";\r
-            // \r
             // folderBrowserDialogOutputDir\r
             // \r
             this.folderBrowserDialogOutputDir.Description = "報告書の出力先を指定します。";\r
@@ -892,15 +1192,18 @@ namespace KancolleSniffer
             this.ShowIcon = false;\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
             this.Text = "設定";\r
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ConfigDialog_FormClosing);\r
             this.Load += new System.EventHandler(this.ConfigDialog_Load);\r
             this.tabControl.ResumeLayout(false);\r
-            this.tabPageShow.ResumeLayout(false);\r
-            this.tabPageShow.PerformLayout();\r
+            this.tabPageWindow.ResumeLayout(false);\r
+            this.tabPageWindow.PerformLayout();\r
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQuest)).EndInit();\r
             this.tabPageNotification.ResumeLayout(false);\r
             this.tabPageNotification.PerformLayout();\r
             ((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
@@ -911,14 +1214,18 @@ namespace KancolleSniffer
             this.tabPageVersion.ResumeLayout(false);\r
             this.tabPageVersion.PerformLayout();\r
             this.tabPageProxy.ResumeLayout(false);\r
-            this.tabPageProxy.PerformLayout();\r
             this.groupBoxUpstream.ResumeLayout(false);\r
             this.groupBoxUpstream.PerformLayout();\r
+            this.groupBoxAutoConfig.ResumeLayout(false);\r
+            this.groupBoxAutoConfig.PerformLayout();\r
             this.tabPageLog.ResumeLayout(false);\r
             this.tabPageLog.PerformLayout();\r
-            this.groupBox1.ResumeLayout(false);\r
-            this.groupBox1.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaterialLogInterval)).EndInit();\r
+            this.tabPagePush.ResumeLayout(false);\r
+            this.groupBoxPushover.ResumeLayout(false);\r
+            this.groupBoxPushover.PerformLayout();\r
+            this.groupBoxPushbullet.ResumeLayout(false);\r
+            this.groupBoxPushbullet.PerformLayout();\r
             this.tabPageDebug.ResumeLayout(false);\r
             this.tabPageDebug.PerformLayout();\r
             this.ResumeLayout(false);\r
@@ -928,7 +1235,7 @@ namespace KancolleSniffer
         #endregion\r
 \r
         private System.Windows.Forms.TabControl tabControl;\r
-        private System.Windows.Forms.TabPage tabPageShow;\r
+        private System.Windows.Forms.TabPage tabPageWindow;\r
         private System.Windows.Forms.TabPage tabPageNotification;\r
         private System.Windows.Forms.Button buttonCancel;\r
         private System.Windows.Forms.Button buttonOk;\r
@@ -958,7 +1265,7 @@ namespace KancolleSniffer
         private System.Windows.Forms.TextBox textBoxSoundFile;\r
         private System.Windows.Forms.NumericUpDown numericUpDownSoundVolume;\r
         private System.Windows.Forms.Label label3;\r
-        private System.Windows.Forms.Label label7;\r
+        private System.Windows.Forms.Label labelCopyright;\r
         private System.Windows.Forms.LinkLabel linkLabelProductName;\r
         private System.Windows.Forms.Label labelVersion;\r
         private System.Windows.Forms.Label labelLatest;\r
@@ -970,9 +1277,11 @@ namespace KancolleSniffer
         private System.Windows.Forms.RadioButton radioButtonUpstreamOn;\r
         private System.Windows.Forms.TextBox textBoxPort;\r
         private System.Windows.Forms.Label labelPort;\r
+        private System.Windows.Forms.GroupBox groupBoxAutoConfig;\r
+        private System.Windows.Forms.RadioButton radioButtonAutoConfigOff;\r
+        private System.Windows.Forms.RadioButton radioButtonAutoConfigOn;\r
         private System.Windows.Forms.TextBox textBoxListen;\r
         private System.Windows.Forms.Label labelListen;\r
-        private System.Windows.Forms.ToolTip toolTipError;\r
         private System.Windows.Forms.TabPage tabPageLog;\r
         private System.Windows.Forms.Label label10;\r
         private System.Windows.Forms.CheckBox checkBoxOutput;\r
@@ -983,11 +1292,6 @@ namespace KancolleSniffer
         private System.Windows.Forms.NumericUpDown numericUpDownMaterialLogInterval;\r
         private System.Windows.Forms.FolderBrowserDialog folderBrowserDialogOutputDir;\r
         private System.Windows.Forms.TabPage tabPageDebug;\r
-        private System.Windows.Forms.GroupBox groupBox1;\r
-        private System.Windows.Forms.RadioButton radioButtonServerOff;\r
-        private System.Windows.Forms.RadioButton radioButtonServerOn;\r
-        private System.Windows.Forms.TextBox textBoxServer;\r
-        private System.Windows.Forms.Label label12;\r
         private System.Windows.Forms.Button buttonPlayDebugLog;\r
         private System.Windows.Forms.Button buttonDebugLogOpenFile;\r
         private System.Windows.Forms.TextBox textBoxDebugLog;\r
@@ -996,7 +1300,35 @@ namespace KancolleSniffer
         private System.Windows.Forms.OpenFileDialog openDebugLogDialog;\r
         private System.Windows.Forms.GroupBox groupBox3;\r
         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 checkBoxPresetAkashi;\r
+        private System.Windows.Forms.TabPage tabPagePush;\r
+        private System.Windows.Forms.ComboBox comboBoxZoom;\r
+        private System.Windows.Forms.Label label14;\r
+        private System.Windows.Forms.Label label15;\r
+        private System.Windows.Forms.Button buttonDetailedSettings;\r
+        private System.Windows.Forms.GroupBox groupBoxPushbullet;\r
+        private System.Windows.Forms.TextBox textBoxPushbulletToken;\r
+        private System.Windows.Forms.Label label7;\r
+        private System.Windows.Forms.CheckBox checkBoxPushbulletOn;\r
+        private System.Windows.Forms.Button buttonPushbulletTest;\r
+        private System.Windows.Forms.CheckBox checkBoxExitSilently;\r
+        private System.Windows.Forms.CheckBox checkBoxLocationPerMachine;\r
+        private System.Windows.Forms.TextBox textBoxPushoverApiKey;\r
+        private System.Windows.Forms.CheckBox checkBoxPushoverOn;\r
+        private System.Windows.Forms.GroupBox groupBoxPushover;\r
+        private System.Windows.Forms.Button buttonPushoverTest;\r
+        private System.Windows.Forms.Label label16;\r
+        private System.Windows.Forms.Label label12;\r
+        private System.Windows.Forms.TextBox textBoxPushoverUserKey;\r
+        private System.Windows.Forms.CheckBox checkBoxRepeat;\r
+        private System.Windows.Forms.CheckBox checkBoxBattleResult;\r
+        private System.Windows.Forms.CheckBox checkBoxAirBattleResult;\r
+        private System.Windows.Forms.CheckBox checkBoxResultRank;\r
+        private System.Windows.Forms.CheckBox checkBoxNextCell;\r
+        private System.Windows.Forms.Label label8;\r
+        private System.Windows.Forms.NumericUpDown numericUpDownQuest;\r
+        private System.Windows.Forms.Label label17;\r
+        private System.Windows.Forms.Label label18;\r
+        private System.Windows.Forms.CheckBox checkBoxWarnBadDamageWithDamecon;\r
     }\r
 }
\ No newline at end of file