入渠と遠征のタイマー以外の部分のクリックを無効にする

diff --git a/KancolleSniffer/Forms/HorizontalMainForm.Designer.cs b/KancolleSniffer/Forms/HorizontalMainForm.Designer.cs
index 5ff5982..f1221b2 100644 (file)
--- a/KancolleSniffer/Forms/HorizontalMainForm.Designer.cs
+++ b/KancolleSniffer/Forms/HorizontalMainForm.Designer.cs
@@ -184,7 +184,6 @@ namespace KancolleSniffer.Forms
             // ndockPanel\r
             // \r
             this.ndockPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             // ndockPanel\r
             // \r
             this.ndockPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r

-            this.ndockPanel.Cursor = System.Windows.Forms.Cursors.Hand;\r

             this.ndockPanel.Location = new System.Drawing.Point(458, 87);\r
             this.ndockPanel.Name = "ndockPanel";\r
             this.ndockPanel.Size = new System.Drawing.Size(140, 64);\r
             this.ndockPanel.Location = new System.Drawing.Point(458, 87);\r
             this.ndockPanel.Name = "ndockPanel";\r
             this.ndockPanel.Size = new System.Drawing.Size(140, 64);\r


@@ -193,7 +192,6 @@ namespace KancolleSniffer.Forms
             // missionPanel\r
             // \r
             this.missionPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             // missionPanel\r
             // \r
             this.missionPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r

-            this.missionPanel.Cursor = System.Windows.Forms.Cursors.Hand;\r

             this.missionPanel.Location = new System.Drawing.Point(458, 20);\r
             this.missionPanel.Name = "missionPanel";\r
             this.missionPanel.Size = new System.Drawing.Size(220, 49);\r
             this.missionPanel.Location = new System.Drawing.Point(458, 20);\r
             this.missionPanel.Name = "missionPanel";\r
             this.missionPanel.Size = new System.Drawing.Size(220, 49);\r


@@ -234,7 +232,7 @@ namespace KancolleSniffer.Forms
             this.dropDownButtonMaterialHistory.TabIndex = 80;\r
             this.dropDownButtonMaterialHistory.Text = "dropDownButton1";\r
             // \r
             this.dropDownButtonMaterialHistory.TabIndex = 80;\r
             this.dropDownButtonMaterialHistory.Text = "dropDownButton1";\r
             // \r

-            // mainFleetPanel\r
+            // fleetPanel\r

             // \r
             this.fleetPanel.Context = null;\r
             this.fleetPanel.Location = new System.Drawing.Point(232, 3);\r
             // \r
             this.fleetPanel.Context = null;\r
             this.fleetPanel.Location = new System.Drawing.Point(232, 3);\r

diff --git a/KancolleSniffer/Forms/VerticalMainForm.Designer.cs b/KancolleSniffer/Forms/VerticalMainForm.Designer.cs
index faaf35a..1851a30 100644 (file)
--- a/KancolleSniffer/Forms/VerticalMainForm.Designer.cs
+++ b/KancolleSniffer/Forms/VerticalMainForm.Designer.cs
@@ -184,7 +184,6 @@ namespace KancolleSniffer.Forms
             // ndockPanel\r
             // \r
             this.ndockPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             // ndockPanel\r
             // \r
             this.ndockPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r

-            this.ndockPanel.Cursor = System.Windows.Forms.Cursors.Hand;\r

             this.ndockPanel.Location = new System.Drawing.Point(6, 208);\r
             this.ndockPanel.Name = "ndockPanel";\r
             this.ndockPanel.Size = new System.Drawing.Size(140, 64);\r
             this.ndockPanel.Location = new System.Drawing.Point(6, 208);\r
             this.ndockPanel.Name = "ndockPanel";\r
             this.ndockPanel.Size = new System.Drawing.Size(140, 64);\r


@@ -234,7 +233,7 @@ namespace KancolleSniffer.Forms
             this.dropDownButtonMaterialHistory.TabIndex = 80;\r
             this.dropDownButtonMaterialHistory.Text = "dropDownButton1";\r
             // \r
             this.dropDownButtonMaterialHistory.TabIndex = 80;\r
             this.dropDownButtonMaterialHistory.Text = "dropDownButton1";\r
             // \r

-            // mainFleetPanel\r
+            // fleetPanel\r

             // \r
             this.fleetPanel.Context = null;\r
             this.fleetPanel.Location = new System.Drawing.Point(6, 42);\r
             // \r
             this.fleetPanel.Context = null;\r
             this.fleetPanel.Location = new System.Drawing.Point(6, 42);\r

diff --git a/KancolleSniffer/View/MainWindow/MissionPanel.cs b/KancolleSniffer/View/MainWindow/MissionPanel.cs
index b915da6..ff5f0bc 100644 (file)
--- a/KancolleSniffer/View/MainWindow/MissionPanel.cs
+++ b/KancolleSniffer/View/MainWindow/MissionPanel.cs
@@ -13,6 +13,7 @@
 // limitations under the License.\r
 \r
 using System;\r
 // limitations under the License.\r
 \r
 using System;\r

+using System.Collections.Generic;\r

 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r


@@ -72,8 +73,9 @@ namespace KancolleSniffer.View.MainWindow
                 };\r
             }\r
             Controls.AddRange(_labels.SelectMany(l => new Control[] {l.Number, l.Params, l.Timer, l.Name}).ToArray());\r
                 };\r
             }\r
             Controls.AddRange(_labels.SelectMany(l => new Control[] {l.Number, l.Params, l.Timer, l.Name}).ToArray());\r

-            SetCursor();\r
-            SetClickHandler();\r
+            var timers = _labels.Select(l => l.Timer).ToArray();\r
+            SetCursor(timers);\r
+            SetClickHandler(timers);\r

         }\r
 \r
         public void SetClickHandler(Label caption)\r
         }\r
 \r
         public void SetClickHandler(Label caption)\r


@@ -82,17 +84,15 @@ namespace KancolleSniffer.View.MainWindow
             _caption = caption;\r
         }\r
 \r
             _caption = caption;\r
         }\r
 \r

-        private void SetCursor()\r
+        private void SetCursor(IEnumerable<Control> controls)\r

         {\r
         {\r

-            Cursor = Cursors.Hand;\r
-            foreach (Control control in Controls)\r
+            foreach (var control in controls)\r

                 control.Cursor = Cursors.Hand;\r
         }\r
 \r
                 control.Cursor = Cursors.Hand;\r
         }\r
 \r

-        private void SetClickHandler()\r
+        private void SetClickHandler(IEnumerable<Control> controls)\r

         {\r
         {\r

-            Click += ClickHandler;\r
-            foreach (Control control in Controls)\r
+            foreach (var control in controls)\r

                 control.Click += ClickHandler;\r
         }\r
 \r
                 control.Click += ClickHandler;\r
         }\r
 \r

diff --git a/KancolleSniffer/View/MainWindow/NDockPanel.cs b/KancolleSniffer/View/MainWindow/NDockPanel.cs
index e72c138..cd88247 100644 (file)
--- a/KancolleSniffer/View/MainWindow/NDockPanel.cs
+++ b/KancolleSniffer/View/MainWindow/NDockPanel.cs
@@ -13,6 +13,8 @@
 // limitations under the License.\r
 \r
 using System;\r
 // limitations under the License.\r
 \r
 using System;\r

+using System.Collections;\r
+using System.Collections.Generic;\r

 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r


@@ -63,8 +65,9 @@ namespace KancolleSniffer.View.MainWindow
                 };\r
             }\r
             Controls.AddRange(_labels.SelectMany(l => new Control[] {l.Number, l.Name, l.Timer}).ToArray());\r
                 };\r
             }\r
             Controls.AddRange(_labels.SelectMany(l => new Control[] {l.Number, l.Name, l.Timer}).ToArray());\r

-            SetCursor();\r
-            SetClickHandler();\r
+            var timers = _labels.Select(l => l.Timer).ToArray();\r
+            SetCursor(timers);\r
+            SetClickHandler(timers);\r

         }\r
 \r
         public void SetClickHandler(Label caption)\r
         }\r
 \r
         public void SetClickHandler(Label caption)\r


@@ -73,17 +76,15 @@ namespace KancolleSniffer.View.MainWindow
             _caption = caption;\r
         }\r
 \r
             _caption = caption;\r
         }\r
 \r

-        private void SetCursor()\r
+        private void SetCursor(IEnumerable<Control> controls)\r

         {\r
         {\r

-            Cursor = Cursors.Hand;\r
-            foreach (Control control in Controls)\r
+            foreach (var control in controls)\r

                 control.Cursor = Cursors.Hand;\r
         }\r
 \r
                 control.Cursor = Cursors.Hand;\r
         }\r
 \r

-        private void SetClickHandler()\r
+        private void SetClickHandler(IEnumerable<Control> controls)\r

         {\r
         {\r

-            Click += ClickHandler;\r
-            foreach (Control control in Controls)\r
+            foreach (var control in controls)\r

                 control.Click += ClickHandler;\r
         }\r
 \r
                 control.Click += ClickHandler;\r
         }\r
 \r