OSDN Git Service

設定ダイアログをTabControlを使って作り直す
authorKazuhiro Fujieda <fujieda@users.sourceforge.jp>
Sat, 31 Jan 2015 10:52:12 +0000 (19:52 +0900)
committerKazuhiro Fujieda <fujieda@users.sourceforge.jp>
Thu, 5 Feb 2015 10:34:32 +0000 (19:34 +0900)
KancolleSniffer/ConfigDialog.Designer.cs
KancolleSniffer/ConfigDialog.cs
KancolleSniffer/ConfigDialog.resx

index c4e9a73..41c5766 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Kazuhiro Fujieda <fujieda@users.sourceforge.jp>\r
+// Copyright (C) 2014, 2015 Kazuhiro Fujieda <fujieda@users.sourceforge.jp>\r
 // \r
 // This program is part of KancolleSniffer.\r
 //\r
@@ -46,7 +46,11 @@ namespace KancolleSniffer
         private void InitializeComponent()\r
         {\r
             this.components = new System.ComponentModel.Container();\r
-            this.groupBoxNotification = new System.Windows.Forms.GroupBox();\r
+            this.tabControl = new System.Windows.Forms.TabControl();\r
+            this.tabPageShow = new System.Windows.Forms.TabPage();\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.label6 = new System.Windows.Forms.Label();\r
             this.checkBoxCond49 = new System.Windows.Forms.CheckBox();\r
             this.checkBoxCond40 = new System.Windows.Forms.CheckBox();\r
@@ -59,105 +63,151 @@ namespace KancolleSniffer
             this.checkBoxSound = new System.Windows.Forms.CheckBox();\r
             this.checkBoxBalloon = new System.Windows.Forms.CheckBox();\r
             this.checkBoxFlash = new System.Windows.Forms.CheckBox();\r
-            this.groupBoxSound = new System.Windows.Forms.GroupBox();\r
+            this.tabPageAchievement = new System.Windows.Forms.TabPage();\r
+            this.buttonResetAchievement = new System.Windows.Forms.Button();\r
+            this.label8 = new System.Windows.Forms.Label();\r
+            this.checkBoxReset14 = new System.Windows.Forms.CheckBox();\r
+            this.checkBoxReset02 = new System.Windows.Forms.CheckBox();\r
+            this.tabPageSound = new System.Windows.Forms.TabPage();\r
             this.buttonPlay = new System.Windows.Forms.Button();\r
             this.listBoxSoundFile = new System.Windows.Forms.ListBox();\r
             this.buttonOpenFile = new System.Windows.Forms.Button();\r
             this.textBoxSoundFile = new System.Windows.Forms.TextBox();\r
             this.numericUpDownSoundVolume = new System.Windows.Forms.NumericUpDown();\r
             this.label3 = new System.Windows.Forms.Label();\r
-            this.buttonOk = new System.Windows.Forms.Button();\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.linkLabelProductName = new System.Windows.Forms.LinkLabel();\r
+            this.labelVersion = new System.Windows.Forms.Label();\r
+            this.labelLatest = new System.Windows.Forms.Label();\r
             this.buttonCancel = new System.Windows.Forms.Button();\r
-            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();\r
-            this.groupBoxShow = new System.Windows.Forms.GroupBox();\r
-            this.checkBoxHideOnMinimized = new System.Windows.Forms.CheckBox();\r
-            this.checkBoxTopMost = new System.Windows.Forms.CheckBox();\r
-            this.groupBoxAchievement = new System.Windows.Forms.GroupBox();\r
-            this.buttonResetAchievement = new System.Windows.Forms.Button();\r
-            this.label8 = new System.Windows.Forms.Label();\r
-            this.checkBoxReset14 = new System.Windows.Forms.CheckBox();\r
-            this.checkBoxReset02 = new System.Windows.Forms.CheckBox();\r
+            this.buttonOk = new System.Windows.Forms.Button();\r
             this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.ReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ProxyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DebugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.labelVersion = new System.Windows.Forms.Label();\r
-            this.labelLatest = new System.Windows.Forms.Label();\r
-            this.groupBoxVersion = new System.Windows.Forms.GroupBox();\r
-            this.linkLabelProductName = new System.Windows.Forms.LinkLabel();\r
-            this.groupBoxNotification.SuspendLayout();\r
+            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();\r
+            this.tabControl.SuspendLayout();\r
+            this.tabPageShow.SuspendLayout();\r
+            this.tabPageNotification.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMarginEquips)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMarginShips)).BeginInit();\r
-            this.groupBoxSound.SuspendLayout();\r
+            this.tabPageAchievement.SuspendLayout();\r
+            this.tabPageSound.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSoundVolume)).BeginInit();\r
-            this.groupBoxShow.SuspendLayout();\r
-            this.groupBoxAchievement.SuspendLayout();\r
+            this.tabPageVersion.SuspendLayout();\r
             this.contextMenuStrip.SuspendLayout();\r
-            this.groupBoxVersion.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
-            // groupBoxNotification\r
-            // \r
-            this.groupBoxNotification.Controls.Add(this.label6);\r
-            this.groupBoxNotification.Controls.Add(this.checkBoxCond49);\r
-            this.groupBoxNotification.Controls.Add(this.checkBoxCond40);\r
-            this.groupBoxNotification.Controls.Add(this.label5);\r
-            this.groupBoxNotification.Controls.Add(this.numericUpDownMarginEquips);\r
-            this.groupBoxNotification.Controls.Add(this.label4);\r
-            this.groupBoxNotification.Controls.Add(this.numericUpDownMarginShips);\r
-            this.groupBoxNotification.Controls.Add(this.label2);\r
-            this.groupBoxNotification.Controls.Add(this.label1);\r
-            this.groupBoxNotification.Controls.Add(this.checkBoxSound);\r
-            this.groupBoxNotification.Controls.Add(this.checkBoxBalloon);\r
-            this.groupBoxNotification.Controls.Add(this.checkBoxFlash);\r
-            this.groupBoxNotification.Location = new System.Drawing.Point(6, 116);\r
-            this.groupBoxNotification.Name = "groupBoxNotification";\r
-            this.groupBoxNotification.Size = new System.Drawing.Size(240, 147);\r
-            this.groupBoxNotification.TabIndex = 0;\r
-            this.groupBoxNotification.TabStop = false;\r
-            this.groupBoxNotification.Text = "通知";\r
+            // tabControl\r
+            // \r
+            this.tabControl.Controls.Add(this.tabPageShow);\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.Location = new System.Drawing.Point(6, 6);\r
+            this.tabControl.Name = "tabControl";\r
+            this.tabControl.SelectedIndex = 0;\r
+            this.tabControl.Size = new System.Drawing.Size(262, 173);\r
+            this.tabControl.TabIndex = 0;\r
+            // \r
+            // tabPageShow\r
+            // \r
+            this.tabPageShow.Controls.Add(this.checkBoxHideOnMinimized);\r
+            this.tabPageShow.Controls.Add(this.checkBoxTopMost);\r
+            this.tabPageShow.Location = new System.Drawing.Point(4, 22);\r
+            this.tabPageShow.Name = "tabPageShow";\r
+            this.tabPageShow.Padding = new System.Windows.Forms.Padding(8);\r
+            this.tabPageShow.Size = new System.Drawing.Size(254, 147);\r
+            this.tabPageShow.TabIndex = 0;\r
+            this.tabPageShow.Text = "表示";\r
+            this.tabPageShow.UseVisualStyleBackColor = true;\r
+            // \r
+            // checkBoxHideOnMinimized\r
+            // \r
+            this.checkBoxHideOnMinimized.AutoSize = true;\r
+            this.checkBoxHideOnMinimized.Location = new System.Drawing.Point(11, 32);\r
+            this.checkBoxHideOnMinimized.Name = "checkBoxHideOnMinimized";\r
+            this.checkBoxHideOnMinimized.Size = new System.Drawing.Size(188, 16);\r
+            this.checkBoxHideOnMinimized.TabIndex = 3;\r
+            this.checkBoxHideOnMinimized.Text = "最小化時にタスクバーに表示しない";\r
+            this.checkBoxHideOnMinimized.UseVisualStyleBackColor = true;\r
+            // \r
+            // checkBoxTopMost\r
+            // \r
+            this.checkBoxTopMost.AutoSize = true;\r
+            this.checkBoxTopMost.Location = new System.Drawing.Point(11, 11);\r
+            this.checkBoxTopMost.Name = "checkBoxTopMost";\r
+            this.checkBoxTopMost.Size = new System.Drawing.Size(112, 16);\r
+            this.checkBoxTopMost.TabIndex = 2;\r
+            this.checkBoxTopMost.Text = "最前面に表示する";\r
+            this.checkBoxTopMost.UseVisualStyleBackColor = true;\r
+            // \r
+            // tabPageNotification\r
+            // \r
+            this.tabPageNotification.Controls.Add(this.label6);\r
+            this.tabPageNotification.Controls.Add(this.checkBoxCond49);\r
+            this.tabPageNotification.Controls.Add(this.checkBoxCond40);\r
+            this.tabPageNotification.Controls.Add(this.label5);\r
+            this.tabPageNotification.Controls.Add(this.numericUpDownMarginEquips);\r
+            this.tabPageNotification.Controls.Add(this.label4);\r
+            this.tabPageNotification.Controls.Add(this.numericUpDownMarginShips);\r
+            this.tabPageNotification.Controls.Add(this.label2);\r
+            this.tabPageNotification.Controls.Add(this.label1);\r
+            this.tabPageNotification.Controls.Add(this.checkBoxSound);\r
+            this.tabPageNotification.Controls.Add(this.checkBoxBalloon);\r
+            this.tabPageNotification.Controls.Add(this.checkBoxFlash);\r
+            this.tabPageNotification.Location = new System.Drawing.Point(4, 22);\r
+            this.tabPageNotification.Name = "tabPageNotification";\r
+            this.tabPageNotification.Padding = new System.Windows.Forms.Padding(8);\r
+            this.tabPageNotification.Size = new System.Drawing.Size(254, 147);\r
+            this.tabPageNotification.TabIndex = 1;\r
+            this.tabPageNotification.Text = "通知";\r
+            this.tabPageNotification.UseVisualStyleBackColor = true;\r
             // \r
             // label6\r
             // \r
             this.label6.AutoSize = true;\r
-            this.label6.Location = new System.Drawing.Point(4, 126);\r
+            this.label6.Location = new System.Drawing.Point(9, 119);\r
             this.label6.Name = "label6";\r
             this.label6.Size = new System.Drawing.Size(105, 12);\r
-            this.label6.TabIndex = 13;\r
+            this.label6.TabIndex = 25;\r
             this.label6.Text = "疲労回復を通知する";\r
             // \r
             // checkBoxCond49\r
             // \r
             this.checkBoxCond49.AutoSize = true;\r
-            this.checkBoxCond49.Location = new System.Drawing.Point(175, 125);\r
+            this.checkBoxCond49.Location = new System.Drawing.Point(180, 118);\r
             this.checkBoxCond49.Name = "checkBoxCond49";\r
             this.checkBoxCond49.Size = new System.Drawing.Size(60, 16);\r
-            this.checkBoxCond49.TabIndex = 12;\r
+            this.checkBoxCond49.TabIndex = 24;\r
             this.checkBoxCond49.Text = "cond49";\r
             this.checkBoxCond49.UseVisualStyleBackColor = true;\r
             // \r
             // checkBoxCond40\r
             // \r
             this.checkBoxCond40.AutoSize = true;\r
-            this.checkBoxCond40.Location = new System.Drawing.Point(113, 125);\r
+            this.checkBoxCond40.Location = new System.Drawing.Point(118, 118);\r
             this.checkBoxCond40.Name = "checkBoxCond40";\r
             this.checkBoxCond40.Size = new System.Drawing.Size(60, 16);\r
-            this.checkBoxCond40.TabIndex = 11;\r
+            this.checkBoxCond40.TabIndex = 23;\r
             this.checkBoxCond40.Text = "cond40";\r
             this.checkBoxCond40.UseVisualStyleBackColor = true;\r
             // \r
             // label5\r
             // \r
             this.label5.AutoSize = true;\r
-            this.label5.Location = new System.Drawing.Point(113, 103);\r
+            this.label5.Location = new System.Drawing.Point(118, 96);\r
             this.label5.Name = "label5";\r
             this.label5.Size = new System.Drawing.Size(70, 12);\r
-            this.label5.TabIndex = 9;\r
+            this.label5.TabIndex = 22;\r
             this.label5.Text = "個で通知する";\r
             // \r
             // numericUpDownMarginEquips\r
             // \r
-            this.numericUpDownMarginEquips.Location = new System.Drawing.Point(76, 101);\r
+            this.numericUpDownMarginEquips.Location = new System.Drawing.Point(81, 94);\r
             this.numericUpDownMarginEquips.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);\r
             this.numericUpDownMarginEquips.Maximum = new decimal(new int[] {\r
             99,\r
@@ -166,21 +216,21 @@ namespace KancolleSniffer
             0});\r
             this.numericUpDownMarginEquips.Name = "numericUpDownMarginEquips";\r
             this.numericUpDownMarginEquips.Size = new System.Drawing.Size(36, 19);\r
-            this.numericUpDownMarginEquips.TabIndex = 8;\r
+            this.numericUpDownMarginEquips.TabIndex = 21;\r
             this.numericUpDownMarginEquips.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;\r
             // \r
             // label4\r
             // \r
             this.label4.AutoSize = true;\r
-            this.label4.Location = new System.Drawing.Point(47, 103);\r
+            this.label4.Location = new System.Drawing.Point(52, 96);\r
             this.label4.Name = "label4";\r
             this.label4.Size = new System.Drawing.Size(29, 12);\r
-            this.label4.TabIndex = 7;\r
+            this.label4.TabIndex = 20;\r
             this.label4.Text = "装備";\r
             // \r
             // numericUpDownMarginShips\r
             // \r
-            this.numericUpDownMarginShips.Location = new System.Drawing.Point(76, 81);\r
+            this.numericUpDownMarginShips.Location = new System.Drawing.Point(80, 74);\r
             this.numericUpDownMarginShips.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);\r
             this.numericUpDownMarginShips.Maximum = new decimal(new int[] {\r
             99,\r
@@ -189,80 +239,134 @@ namespace KancolleSniffer
             0});\r
             this.numericUpDownMarginShips.Name = "numericUpDownMarginShips";\r
             this.numericUpDownMarginShips.Size = new System.Drawing.Size(36, 19);\r
-            this.numericUpDownMarginShips.TabIndex = 6;\r
+            this.numericUpDownMarginShips.TabIndex = 19;\r
             this.numericUpDownMarginShips.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;\r
             // \r
             // label2\r
             // \r
             this.label2.AutoSize = true;\r
-            this.label2.Location = new System.Drawing.Point(113, 83);\r
+            this.label2.Location = new System.Drawing.Point(118, 76);\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
-            this.label2.TabIndex = 5;\r
+            this.label2.TabIndex = 18;\r
             this.label2.Text = "隻";\r
             // \r
             // label1\r
             // \r
             this.label1.AutoSize = true;\r
-            this.label1.Location = new System.Drawing.Point(4, 83);\r
+            this.label1.Location = new System.Drawing.Point(9, 76);\r
             this.label1.Name = "label1";\r
             this.label1.Size = new System.Drawing.Size(72, 12);\r
-            this.label1.TabIndex = 3;\r
+            this.label1.TabIndex = 17;\r
             this.label1.Text = "上限まで艦娘";\r
             // \r
             // checkBoxSound\r
             // \r
             this.checkBoxSound.AutoSize = true;\r
-            this.checkBoxSound.Location = new System.Drawing.Point(6, 60);\r
+            this.checkBoxSound.Location = new System.Drawing.Point(11, 53);\r
             this.checkBoxSound.Name = "checkBoxSound";\r
             this.checkBoxSound.Size = new System.Drawing.Size(113, 16);\r
-            this.checkBoxSound.TabIndex = 2;\r
+            this.checkBoxSound.TabIndex = 16;\r
             this.checkBoxSound.Text = "サウンドを再生する";\r
             this.checkBoxSound.UseVisualStyleBackColor = true;\r
-            this.checkBoxSound.CheckedChanged += new System.EventHandler(this.checkBoxSound_CheckedChanged);\r
             // \r
             // checkBoxBalloon\r
             // \r
             this.checkBoxBalloon.AutoSize = true;\r
-            this.checkBoxBalloon.Location = new System.Drawing.Point(6, 39);\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.TabIndex = 1;\r
+            this.checkBoxBalloon.TabIndex = 15;\r
             this.checkBoxBalloon.Text = "通知領域にバルーンを表示する";\r
             this.checkBoxBalloon.UseVisualStyleBackColor = true;\r
             // \r
             // checkBoxFlash\r
             // \r
             this.checkBoxFlash.AutoSize = true;\r
-            this.checkBoxFlash.Location = new System.Drawing.Point(6, 18);\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.TabIndex = 0;\r
+            this.checkBoxFlash.TabIndex = 14;\r
             this.checkBoxFlash.Text = "ウィンドウを点滅させる";\r
             this.checkBoxFlash.UseVisualStyleBackColor = true;\r
             // \r
-            // groupBoxSound\r
-            // \r
-            this.groupBoxSound.Controls.Add(this.buttonPlay);\r
-            this.groupBoxSound.Controls.Add(this.listBoxSoundFile);\r
-            this.groupBoxSound.Controls.Add(this.buttonOpenFile);\r
-            this.groupBoxSound.Controls.Add(this.textBoxSoundFile);\r
-            this.groupBoxSound.Controls.Add(this.numericUpDownSoundVolume);\r
-            this.groupBoxSound.Controls.Add(this.label3);\r
-            this.groupBoxSound.Location = new System.Drawing.Point(6, 311);\r
-            this.groupBoxSound.Name = "groupBoxSound";\r
-            this.groupBoxSound.Size = new System.Drawing.Size(240, 138);\r
-            this.groupBoxSound.TabIndex = 1;\r
-            this.groupBoxSound.TabStop = false;\r
-            this.groupBoxSound.Text = "サウンド";\r
+            // tabPageAchievement\r
+            // \r
+            this.tabPageAchievement.Controls.Add(this.buttonResetAchievement);\r
+            this.tabPageAchievement.Controls.Add(this.label8);\r
+            this.tabPageAchievement.Controls.Add(this.checkBoxReset14);\r
+            this.tabPageAchievement.Controls.Add(this.checkBoxReset02);\r
+            this.tabPageAchievement.Location = new System.Drawing.Point(4, 22);\r
+            this.tabPageAchievement.Name = "tabPageAchievement";\r
+            this.tabPageAchievement.Padding = new System.Windows.Forms.Padding(8);\r
+            this.tabPageAchievement.Size = new System.Drawing.Size(254, 147);\r
+            this.tabPageAchievement.TabIndex = 2;\r
+            this.tabPageAchievement.Text = "戦果";\r
+            this.tabPageAchievement.UseVisualStyleBackColor = true;\r
+            // \r
+            // buttonResetAchievement\r
+            // \r
+            this.buttonResetAchievement.Location = new System.Drawing.Point(101, 8);\r
+            this.buttonResetAchievement.Name = "buttonResetAchievement";\r
+            this.buttonResetAchievement.Size = new System.Drawing.Size(44, 20);\r
+            this.buttonResetAchievement.TabIndex = 16;\r
+            this.buttonResetAchievement.Text = "今すぐ";\r
+            this.buttonResetAchievement.UseVisualStyleBackColor = true;\r
+            this.buttonResetAchievement.Click += new System.EventHandler(this.buttonResetAchievement_Click);\r
+            // \r
+            // label8\r
+            // \r
+            this.label8.AutoSize = true;\r
+            this.label8.Location = new System.Drawing.Point(147, 12);\r
+            this.label8.Margin = new System.Windows.Forms.Padding(3);\r
+            this.label8.Name = "label8";\r
+            this.label8.Size = new System.Drawing.Size(65, 12);\r
+            this.label8.TabIndex = 15;\r
+            this.label8.Text = "にリセットする";\r
+            // \r
+            // checkBoxReset14\r
+            // \r
+            this.checkBoxReset14.AutoSize = true;\r
+            this.checkBoxReset14.Location = new System.Drawing.Point(54, 11);\r
+            this.checkBoxReset14.Name = "checkBoxReset14";\r
+            this.checkBoxReset14.Size = new System.Drawing.Size(48, 16);\r
+            this.checkBoxReset14.TabIndex = 14;\r
+            this.checkBoxReset14.Text = "14時";\r
+            this.checkBoxReset14.UseVisualStyleBackColor = true;\r
+            // \r
+            // checkBoxReset02\r
+            // \r
+            this.checkBoxReset02.AutoSize = true;\r
+            this.checkBoxReset02.Location = new System.Drawing.Point(11, 11);\r
+            this.checkBoxReset02.Name = "checkBoxReset02";\r
+            this.checkBoxReset02.Size = new System.Drawing.Size(42, 16);\r
+            this.checkBoxReset02.TabIndex = 13;\r
+            this.checkBoxReset02.Text = "2時";\r
+            this.checkBoxReset02.UseVisualStyleBackColor = true;\r
+            // \r
+            // tabPageSound\r
+            // \r
+            this.tabPageSound.Controls.Add(this.buttonPlay);\r
+            this.tabPageSound.Controls.Add(this.listBoxSoundFile);\r
+            this.tabPageSound.Controls.Add(this.buttonOpenFile);\r
+            this.tabPageSound.Controls.Add(this.textBoxSoundFile);\r
+            this.tabPageSound.Controls.Add(this.numericUpDownSoundVolume);\r
+            this.tabPageSound.Controls.Add(this.label3);\r
+            this.tabPageSound.Location = new System.Drawing.Point(4, 22);\r
+            this.tabPageSound.Name = "tabPageSound";\r
+            this.tabPageSound.Padding = new System.Windows.Forms.Padding(8);\r
+            this.tabPageSound.Size = new System.Drawing.Size(254, 147);\r
+            this.tabPageSound.TabIndex = 3;\r
+            this.tabPageSound.Text = "サウンド";\r
+            this.tabPageSound.UseVisualStyleBackColor = true;\r
             // \r
             // buttonPlay\r
             // \r
-            this.buttonPlay.Location = new System.Drawing.Point(91, 13);\r
+            this.buttonPlay.Location = new System.Drawing.Point(93, 6);\r
             this.buttonPlay.Name = "buttonPlay";\r
             this.buttonPlay.Size = new System.Drawing.Size(37, 23);\r
-            this.buttonPlay.TabIndex = 18;\r
+            this.buttonPlay.TabIndex = 24;\r
             this.buttonPlay.Text = "再生";\r
             this.buttonPlay.UseVisualStyleBackColor = true;\r
             this.buttonPlay.Click += new System.EventHandler(this.buttonPlay_Click);\r
@@ -271,161 +375,132 @@ namespace KancolleSniffer
             // \r
             this.listBoxSoundFile.FormattingEnabled = true;\r
             this.listBoxSoundFile.ItemHeight = 12;\r
-            this.listBoxSoundFile.Location = new System.Drawing.Point(6, 41);\r
+            this.listBoxSoundFile.Location = new System.Drawing.Point(11, 34);\r
             this.listBoxSoundFile.Name = "listBoxSoundFile";\r
-            this.listBoxSoundFile.Size = new System.Drawing.Size(228, 64);\r
-            this.listBoxSoundFile.TabIndex = 17;\r
+            this.listBoxSoundFile.Size = new System.Drawing.Size(228, 76);\r
+            this.listBoxSoundFile.TabIndex = 23;\r
             this.listBoxSoundFile.SelectedIndexChanged += new System.EventHandler(this.listBoxSoundFile_SelectedIndexChanged);\r
             // \r
             // buttonOpenFile\r
             // \r
-            this.buttonOpenFile.Location = new System.Drawing.Point(189, 109);\r
+            this.buttonOpenFile.Location = new System.Drawing.Point(196, 114);\r
             this.buttonOpenFile.Name = "buttonOpenFile";\r
             this.buttonOpenFile.Size = new System.Drawing.Size(45, 23);\r
-            this.buttonOpenFile.TabIndex = 16;\r
+            this.buttonOpenFile.TabIndex = 22;\r
             this.buttonOpenFile.Text = "参照...";\r
             this.buttonOpenFile.UseVisualStyleBackColor = true;\r
             this.buttonOpenFile.Click += new System.EventHandler(this.buttonOpenFile_Click);\r
             // \r
             // textBoxSoundFile\r
             // \r
-            this.textBoxSoundFile.Location = new System.Drawing.Point(6, 111);\r
+            this.textBoxSoundFile.Location = new System.Drawing.Point(11, 116);\r
             this.textBoxSoundFile.Name = "textBoxSoundFile";\r
             this.textBoxSoundFile.Size = new System.Drawing.Size(179, 19);\r
-            this.textBoxSoundFile.TabIndex = 15;\r
+            this.textBoxSoundFile.TabIndex = 21;\r
             this.textBoxSoundFile.TextChanged += new System.EventHandler(this.textBoxSoundFile_TextChanged);\r
             // \r
             // numericUpDownSoundVolume\r
             // \r
-            this.numericUpDownSoundVolume.Location = new System.Drawing.Point(41, 16);\r
+            this.numericUpDownSoundVolume.Location = new System.Drawing.Point(42, 9);\r
             this.numericUpDownSoundVolume.Name = "numericUpDownSoundVolume";\r
             this.numericUpDownSoundVolume.Size = new System.Drawing.Size(44, 19);\r
-            this.numericUpDownSoundVolume.TabIndex = 1;\r
+            this.numericUpDownSoundVolume.TabIndex = 20;\r
             this.numericUpDownSoundVolume.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;\r
             // \r
             // label3\r
             // \r
             this.label3.AutoSize = true;\r
-            this.label3.Location = new System.Drawing.Point(6, 18);\r
+            this.label3.Location = new System.Drawing.Point(11, 11);\r
             this.label3.Margin = new System.Windows.Forms.Padding(3);\r
             this.label3.Name = "label3";\r
             this.label3.Size = new System.Drawing.Size(29, 12);\r
-            this.label3.TabIndex = 0;\r
+            this.label3.TabIndex = 19;\r
             this.label3.Text = "音量";\r
             // \r
-            // buttonOk\r
+            // tabPageVersion\r
+            // \r
+            this.tabPageVersion.Controls.Add(this.richTextBox1);\r
+            this.tabPageVersion.Controls.Add(this.label7);\r
+            this.tabPageVersion.Controls.Add(this.linkLabelProductName);\r
+            this.tabPageVersion.Controls.Add(this.labelVersion);\r
+            this.tabPageVersion.Controls.Add(this.labelLatest);\r
+            this.tabPageVersion.Location = new System.Drawing.Point(4, 22);\r
+            this.tabPageVersion.Name = "tabPageVersion";\r
+            this.tabPageVersion.Padding = new System.Windows.Forms.Padding(8);\r
+            this.tabPageVersion.Size = new System.Drawing.Size(254, 147);\r
+            this.tabPageVersion.TabIndex = 4;\r
+            this.tabPageVersion.Text = "バージョン情報";\r
+            this.tabPageVersion.UseVisualStyleBackColor = true;\r
+            // \r
+            // richTextBox1\r
+            // \r
+            this.richTextBox1.BackColor = System.Drawing.SystemColors.Window;\r
+            this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
+            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.TabIndex = 15;\r
+            this.richTextBox1.Text = "このソフトウェアは一部のファイルを除き\nGNU GPLバージョン3でライセンスされます。\n詳細はREADME.mdを参照してください。";\r
+            // \r
+            // label7\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
             // \r
-            this.buttonOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
-            this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK;\r
-            this.buttonOk.Location = new System.Drawing.Point(87, 458);\r
-            this.buttonOk.Margin = new System.Windows.Forms.Padding(3, 8, 3, 3);\r
-            this.buttonOk.Name = "buttonOk";\r
-            this.buttonOk.Size = new System.Drawing.Size(75, 23);\r
-            this.buttonOk.TabIndex = 2;\r
-            this.buttonOk.Text = "OK";\r
-            this.buttonOk.UseVisualStyleBackColor = true;\r
-            this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click);\r
+            // linkLabelProductName\r
+            // \r
+            this.linkLabelProductName.AutoSize = true;\r
+            this.linkLabelProductName.Location = new System.Drawing.Point(11, 11);\r
+            this.linkLabelProductName.Name = "linkLabelProductName";\r
+            this.linkLabelProductName.Size = new System.Drawing.Size(82, 12);\r
+            this.linkLabelProductName.TabIndex = 12;\r
+            this.linkLabelProductName.TabStop = true;\r
+            this.linkLabelProductName.Text = "KancolleSniffer";\r
+            this.linkLabelProductName.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelProductName_LinkClicked);\r
+            // \r
+            // labelVersion\r
+            // \r
+            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.TabIndex = 10;\r
+            this.labelVersion.Text = "バージョン4.10";\r
+            // \r
+            // labelLatest\r
+            // \r
+            this.labelLatest.AutoSize = true;\r
+            this.labelLatest.Location = new System.Drawing.Point(161, 11);\r
+            this.labelLatest.Name = "labelLatest";\r
+            this.labelLatest.Size = new System.Drawing.Size(49, 12);\r
+            this.labelLatest.TabIndex = 11;\r
+            this.labelLatest.Text = "最新です";\r
             // \r
             // buttonCancel\r
             // \r
-            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));\r
             this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;\r
-            this.buttonCancel.Location = new System.Drawing.Point(165, 458);\r
-            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 6, 3, 3);\r
+            this.buttonCancel.Location = new System.Drawing.Point(186, 185);\r
             this.buttonCancel.Name = "buttonCancel";\r
             this.buttonCancel.Size = new System.Drawing.Size(75, 23);\r
-            this.buttonCancel.TabIndex = 3;\r
+            this.buttonCancel.TabIndex = 5;\r
             this.buttonCancel.Text = "キャンセル";\r
             this.buttonCancel.UseVisualStyleBackColor = true;\r
             // \r
-            // openFileDialog\r
-            // \r
-            this.openFileDialog.Filter = "オーディオファイル (*.wav;*.aif;*.aifc;*.aiff;*.wma;*.mp2;*.mp3)|*.wav;*.aif;*.aifc;*.aiff" +\r
-    ";*.wma;*.mp2;*.mp3";\r
-            this.openFileDialog.Title = "オーディオファイルを選択する";\r
-            // \r
-            // groupBoxShow\r
-            // \r
-            this.groupBoxShow.Controls.Add(this.checkBoxHideOnMinimized);\r
-            this.groupBoxShow.Controls.Add(this.checkBoxTopMost);\r
-            this.groupBoxShow.Location = new System.Drawing.Point(6, 51);\r
-            this.groupBoxShow.Name = "groupBoxShow";\r
-            this.groupBoxShow.Size = new System.Drawing.Size(240, 61);\r
-            this.groupBoxShow.TabIndex = 4;\r
-            this.groupBoxShow.TabStop = false;\r
-            this.groupBoxShow.Text = "表示";\r
-            // \r
-            // checkBoxHideOnMinimized\r
-            // \r
-            this.checkBoxHideOnMinimized.AutoSize = true;\r
-            this.checkBoxHideOnMinimized.Location = new System.Drawing.Point(6, 39);\r
-            this.checkBoxHideOnMinimized.Name = "checkBoxHideOnMinimized";\r
-            this.checkBoxHideOnMinimized.Size = new System.Drawing.Size(188, 16);\r
-            this.checkBoxHideOnMinimized.TabIndex = 1;\r
-            this.checkBoxHideOnMinimized.Text = "最小化時にタスクバーに表示しない";\r
-            this.checkBoxHideOnMinimized.UseVisualStyleBackColor = true;\r
-            // \r
-            // checkBoxTopMost\r
-            // \r
-            this.checkBoxTopMost.AutoSize = true;\r
-            this.checkBoxTopMost.Location = new System.Drawing.Point(6, 18);\r
-            this.checkBoxTopMost.Name = "checkBoxTopMost";\r
-            this.checkBoxTopMost.Size = new System.Drawing.Size(112, 16);\r
-            this.checkBoxTopMost.TabIndex = 0;\r
-            this.checkBoxTopMost.Text = "最前面に表示する";\r
-            this.checkBoxTopMost.UseVisualStyleBackColor = true;\r
-            // \r
-            // groupBoxAchievement\r
-            // \r
-            this.groupBoxAchievement.Controls.Add(this.buttonResetAchievement);\r
-            this.groupBoxAchievement.Controls.Add(this.label8);\r
-            this.groupBoxAchievement.Controls.Add(this.checkBoxReset14);\r
-            this.groupBoxAchievement.Controls.Add(this.checkBoxReset02);\r
-            this.groupBoxAchievement.Location = new System.Drawing.Point(6, 267);\r
-            this.groupBoxAchievement.Name = "groupBoxAchievement";\r
-            this.groupBoxAchievement.Size = new System.Drawing.Size(240, 40);\r
-            this.groupBoxAchievement.TabIndex = 5;\r
-            this.groupBoxAchievement.TabStop = false;\r
-            this.groupBoxAchievement.Text = "戦果";\r
-            // \r
-            // buttonResetAchievement\r
-            // \r
-            this.buttonResetAchievement.Location = new System.Drawing.Point(179, 14);\r
-            this.buttonResetAchievement.Name = "buttonResetAchievement";\r
-            this.buttonResetAchievement.Size = new System.Drawing.Size(44, 20);\r
-            this.buttonResetAchievement.TabIndex = 4;\r
-            this.buttonResetAchievement.Text = "今すぐ";\r
-            this.buttonResetAchievement.UseVisualStyleBackColor = true;\r
-            this.buttonResetAchievement.Click += new System.EventHandler(this.buttonResetAchievement_Click);\r
-            // \r
-            // label8\r
-            // \r
-            this.label8.AutoSize = true;\r
-            this.label8.Location = new System.Drawing.Point(6, 18);\r
-            this.label8.Name = "label8";\r
-            this.label8.Size = new System.Drawing.Size(56, 12);\r
-            this.label8.TabIndex = 3;\r
-            this.label8.Text = "リセットする";\r
-            // \r
-            // checkBoxReset14\r
-            // \r
-            this.checkBoxReset14.AutoSize = true;\r
-            this.checkBoxReset14.Location = new System.Drawing.Point(125, 17);\r
-            this.checkBoxReset14.Name = "checkBoxReset14";\r
-            this.checkBoxReset14.Size = new System.Drawing.Size(48, 16);\r
-            this.checkBoxReset14.TabIndex = 2;\r
-            this.checkBoxReset14.Text = "14時";\r
-            this.checkBoxReset14.UseVisualStyleBackColor = true;\r
-            // \r
-            // checkBoxReset02\r
+            // buttonOk\r
             // \r
-            this.checkBoxReset02.AutoSize = true;\r
-            this.checkBoxReset02.Location = new System.Drawing.Point(77, 17);\r
-            this.checkBoxReset02.Name = "checkBoxReset02";\r
-            this.checkBoxReset02.Size = new System.Drawing.Size(42, 16);\r
-            this.checkBoxReset02.TabIndex = 1;\r
-            this.checkBoxReset02.Text = "2時";\r
-            this.checkBoxReset02.UseVisualStyleBackColor = true;\r
+            this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK;\r
+            this.buttonOk.Location = new System.Drawing.Point(105, 185);\r
+            this.buttonOk.Name = "buttonOk";\r
+            this.buttonOk.Size = new System.Drawing.Size(75, 23);\r
+            this.buttonOk.TabIndex = 4;\r
+            this.buttonOk.Text = "OK";\r
+            this.buttonOk.UseVisualStyleBackColor = true;\r
+            this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click);\r
             // \r
             // contextMenuStrip\r
             // \r
@@ -457,127 +532,90 @@ namespace KancolleSniffer
             this.DebugToolStripMenuItem.Text = "デバッグ設定(&D)";\r
             this.DebugToolStripMenuItem.Click += new System.EventHandler(this.DebugToolStripMenuItem_Click);\r
             // \r
-            // labelVersion\r
-            // \r
-            this.labelVersion.AutoSize = true;\r
-            this.labelVersion.Location = new System.Drawing.Point(87, 18);\r
-            this.labelVersion.Name = "labelVersion";\r
-            this.labelVersion.Size = new System.Drawing.Size(70, 12);\r
-            this.labelVersion.TabIndex = 7;\r
-            this.labelVersion.Text = "バージョン4.10";\r
-            // \r
-            // labelLatest\r
-            // \r
-            this.labelLatest.AutoSize = true;\r
-            this.labelLatest.Location = new System.Drawing.Point(156, 18);\r
-            this.labelLatest.Name = "labelLatest";\r
-            this.labelLatest.Size = new System.Drawing.Size(49, 12);\r
-            this.labelLatest.TabIndex = 8;\r
-            this.labelLatest.Text = "最新です";\r
-            // \r
-            // groupBoxVersion\r
-            // \r
-            this.groupBoxVersion.Controls.Add(this.linkLabelProductName);\r
-            this.groupBoxVersion.Controls.Add(this.labelVersion);\r
-            this.groupBoxVersion.Controls.Add(this.labelLatest);\r
-            this.groupBoxVersion.Location = new System.Drawing.Point(6, 6);\r
-            this.groupBoxVersion.Name = "groupBoxVersion";\r
-            this.groupBoxVersion.Size = new System.Drawing.Size(240, 40);\r
-            this.groupBoxVersion.TabIndex = 9;\r
-            this.groupBoxVersion.TabStop = false;\r
-            this.groupBoxVersion.Text = "バージョン情報";\r
-            // \r
-            // linkLabelProductName\r
+            // openFileDialog\r
             // \r
-            this.linkLabelProductName.AutoSize = true;\r
-            this.linkLabelProductName.Location = new System.Drawing.Point(6, 18);\r
-            this.linkLabelProductName.Name = "linkLabelProductName";\r
-            this.linkLabelProductName.Size = new System.Drawing.Size(82, 12);\r
-            this.linkLabelProductName.TabIndex = 9;\r
-            this.linkLabelProductName.TabStop = true;\r
-            this.linkLabelProductName.Text = "KancolleSniffer";\r
-            this.linkLabelProductName.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelProductName_LinkClicked);\r
+            this.openFileDialog.Filter = "オーディオファイル (*.wav;*.aif;*.aifc;*.aiff;*.wma;*.mp2;*.mp3)|*.wav;*.aif;*.aifc;*.aiff" +\r
+    ";*.wma;*.mp2;*.mp3";\r
+            this.openFileDialog.Title = "オーディオファイルを選択する";\r
             // \r
             // ConfigDialog\r
             // \r
-            this.AcceptButton = this.buttonOk;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.CancelButton = this.buttonCancel;\r
-            this.ClientSize = new System.Drawing.Size(252, 490);\r
+            this.ClientSize = new System.Drawing.Size(273, 217);\r
             this.ContextMenuStrip = this.contextMenuStrip;\r
-            this.Controls.Add(this.groupBoxVersion);\r
-            this.Controls.Add(this.groupBoxAchievement);\r
-            this.Controls.Add(this.groupBoxShow);\r
             this.Controls.Add(this.buttonCancel);\r
             this.Controls.Add(this.buttonOk);\r
-            this.Controls.Add(this.groupBoxSound);\r
-            this.Controls.Add(this.groupBoxNotification);\r
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;\r
+            this.Controls.Add(this.tabControl);\r
             this.MaximizeBox = false;\r
             this.MinimizeBox = false;\r
             this.Name = "ConfigDialog";\r
+            this.ShowIcon = false;\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
             this.Text = "設定";\r
             this.Load += new System.EventHandler(this.ConfigDialog_Load);\r
-            this.groupBoxNotification.ResumeLayout(false);\r
-            this.groupBoxNotification.PerformLayout();\r
+            this.tabControl.ResumeLayout(false);\r
+            this.tabPageShow.ResumeLayout(false);\r
+            this.tabPageShow.PerformLayout();\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.groupBoxSound.ResumeLayout(false);\r
-            this.groupBoxSound.PerformLayout();\r
+            this.tabPageAchievement.ResumeLayout(false);\r
+            this.tabPageAchievement.PerformLayout();\r
+            this.tabPageSound.ResumeLayout(false);\r
+            this.tabPageSound.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSoundVolume)).EndInit();\r
-            this.groupBoxShow.ResumeLayout(false);\r
-            this.groupBoxShow.PerformLayout();\r
-            this.groupBoxAchievement.ResumeLayout(false);\r
-            this.groupBoxAchievement.PerformLayout();\r
+            this.tabPageVersion.ResumeLayout(false);\r
+            this.tabPageVersion.PerformLayout();\r
             this.contextMenuStrip.ResumeLayout(false);\r
-            this.groupBoxVersion.ResumeLayout(false);\r
-            this.groupBoxVersion.PerformLayout();\r
             this.ResumeLayout(false);\r
 \r
         }\r
 \r
         #endregion\r
 \r
-        private System.Windows.Forms.GroupBox groupBoxNotification;\r
-        private System.Windows.Forms.CheckBox checkBoxFlash;\r
-        private System.Windows.Forms.CheckBox checkBoxBalloon;\r
-        private System.Windows.Forms.CheckBox checkBoxSound;\r
-        private System.Windows.Forms.GroupBox groupBoxSound;\r
-        private System.Windows.Forms.Button buttonOk;\r
+        private System.Windows.Forms.TabControl tabControl;\r
+        private System.Windows.Forms.TabPage tabPageShow;\r
+        private System.Windows.Forms.TabPage tabPageNotification;\r
         private System.Windows.Forms.Button buttonCancel;\r
-        private System.Windows.Forms.Label label1;\r
-        private System.Windows.Forms.Label label2;\r
-        private System.Windows.Forms.NumericUpDown numericUpDownSoundVolume;\r
-        private System.Windows.Forms.Label label3;\r
-        private System.Windows.Forms.OpenFileDialog openFileDialog;\r
-        private System.Windows.Forms.NumericUpDown numericUpDownMarginShips;\r
-        private System.Windows.Forms.GroupBox groupBoxShow;\r
+        private System.Windows.Forms.Button buttonOk;\r
+        private System.Windows.Forms.TabPage tabPageAchievement;\r
+        private System.Windows.Forms.TabPage tabPageSound;\r
+        private System.Windows.Forms.TabPage tabPageVersion;\r
+        private System.Windows.Forms.CheckBox checkBoxHideOnMinimized;\r
         private System.Windows.Forms.CheckBox checkBoxTopMost;\r
-        private System.Windows.Forms.GroupBox groupBoxAchievement;\r
+        private System.Windows.Forms.Label label6;\r
+        private System.Windows.Forms.CheckBox checkBoxCond49;\r
+        private System.Windows.Forms.CheckBox checkBoxCond40;\r
+        private System.Windows.Forms.Label label5;\r
+        private System.Windows.Forms.NumericUpDown numericUpDownMarginEquips;\r
+        private System.Windows.Forms.Label label4;\r
+        private System.Windows.Forms.NumericUpDown numericUpDownMarginShips;\r
+        private System.Windows.Forms.Label label2;\r
+        private System.Windows.Forms.Label label1;\r
+        private System.Windows.Forms.CheckBox checkBoxSound;\r
+        private System.Windows.Forms.CheckBox checkBoxBalloon;\r
+        private System.Windows.Forms.CheckBox checkBoxFlash;\r
+        private System.Windows.Forms.Button buttonResetAchievement;\r
         private System.Windows.Forms.Label label8;\r
         private System.Windows.Forms.CheckBox checkBoxReset14;\r
         private System.Windows.Forms.CheckBox checkBoxReset02;\r
+        private System.Windows.Forms.Button buttonPlay;\r
+        private System.Windows.Forms.ListBox listBoxSoundFile;\r
         private System.Windows.Forms.Button buttonOpenFile;\r
         private System.Windows.Forms.TextBox textBoxSoundFile;\r
-        private System.Windows.Forms.ContextMenuStrip contextMenuStrip;\r
-        private System.Windows.Forms.ToolStripMenuItem DebugToolStripMenuItem;\r
-        private System.Windows.Forms.Button buttonResetAchievement;\r
-        private System.Windows.Forms.ToolStripMenuItem ProxyToolStripMenuItem;\r
-        private System.Windows.Forms.ListBox listBoxSoundFile;\r
-        private System.Windows.Forms.Button buttonPlay;\r
-        private System.Windows.Forms.CheckBox checkBoxHideOnMinimized;\r
-        private System.Windows.Forms.Label label5;\r
-        private System.Windows.Forms.NumericUpDown numericUpDownMarginEquips;\r
-        private System.Windows.Forms.Label label4;\r
-        private System.Windows.Forms.Label label6;\r
-        private System.Windows.Forms.CheckBox checkBoxCond49;\r
-        private System.Windows.Forms.CheckBox checkBoxCond40;\r
-        private System.Windows.Forms.ToolStripMenuItem ReportToolStripMenuItem;\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.LinkLabel linkLabelProductName;\r
         private System.Windows.Forms.Label labelVersion;\r
         private System.Windows.Forms.Label labelLatest;\r
-        private System.Windows.Forms.GroupBox groupBoxVersion;\r
-        private System.Windows.Forms.LinkLabel linkLabelProductName;\r
+        private System.Windows.Forms.RichTextBox richTextBox1;\r
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip;\r
+        private System.Windows.Forms.ToolStripMenuItem ReportToolStripMenuItem;\r
+        private System.Windows.Forms.ToolStripMenuItem ProxyToolStripMenuItem;\r
+        private System.Windows.Forms.ToolStripMenuItem DebugToolStripMenuItem;\r
+        private System.Windows.Forms.OpenFileDialog openFileDialog;\r
     }\r
 }
\ No newline at end of file
index d421f85..0c672be 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2014 Kazuhiro Fujieda <fujieda@users.sourceforge.jp>\r
+// Copyright (C) 2014, 2015 Kazuhiro Fujieda <fujieda@users.sourceforge.jp>\r
 // \r
 // This program is part of KancolleSniffer.\r
 //\r
@@ -57,7 +57,7 @@ namespace KancolleSniffer
             checkBoxHideOnMinimized.Checked = _config.HideOnMinimized;\r
             checkBoxFlash.Checked = _config.FlashWindow;\r
             checkBoxBalloon.Checked = _config.ShowBaloonTip;\r
-            groupBoxSound.Enabled = checkBoxSound.Checked = _config.PlaySound;\r
+            checkBoxSound.Checked = _config.PlaySound;\r
             numericUpDownMarginShips.Value = _config.MarginShips;\r
             numericUpDownMarginEquips.Value = _config.MarginEquips;\r
             checkBoxCond40.Checked = _config.NotifyConditions.Contains(40);\r
@@ -135,11 +135,6 @@ namespace KancolleSniffer
             _config.ConditionSoundFile = _soundSetting["疲労回復"];\r
         }\r
 \r
-        private void checkBoxSound_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            groupBoxSound.Enabled = checkBoxSound.Checked;\r
-        }\r
-\r
         private void textBoxSoundFile_TextChanged(object sender, EventArgs e)\r
         {\r
             _soundSetting[(string)listBoxSoundFile.SelectedItem] = textBoxSoundFile.Text;\r
index 9f70c6d..1c9b74f 100644 (file)
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>17, 17</value>\r
-  </metadata>\r
   <metadata name="contextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>156, 17</value>\r
+    <value>313, 17</value>\r
+  </metadata>\r
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>470, 17</value>\r
   </metadata>\r
 </root>
\ No newline at end of file