AppliStation-GUI,インストール除外設定リストの設定方法をポップアップヒントからラベルに変更

diff --git a/AppliStation/UserPrefForm.Designer.cs b/AppliStation/UserPrefForm.Designer.cs
index 765ed0d..8ccd8e1 100644 (file)
--- a/AppliStation/UserPrefForm.Designer.cs
+++ b/AppliStation/UserPrefForm.Designer.cs
@@ -29,6 +29,7 @@
                private void InitializeComponent()\r
                {\r
                        this.components = new System.ComponentModel.Container();\r
+                       System.Windows.Forms.Label upgradeExcludeDescLabel;\r
                        this.proxyURLLabel = new System.Windows.Forms.Label();\r
                        this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();\r
                        this.buttonsPanel = new System.Windows.Forms.FlowLayoutPanel();\r
@@ -71,6 +72,7 @@
                        this.upgradeExcludeTextBox = new System.Windows.Forms.TextBox();\r
                        this.toolTip = new System.Windows.Forms.ToolTip(this.components);\r
                        this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);\r
+                       upgradeExcludeDescLabel = new System.Windows.Forms.Label();\r
                        this.tableLayoutPanel.SuspendLayout();\r
                        this.buttonsPanel.SuspendLayout();\r
                        this.tabControl.SuspendLayout();\r
@@ -579,14 +581,14 @@
                        this.upgradeTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        this.upgradeTableLayoutPanel.Controls.Add(this.upgradeExcludeLabel, 0, 0);\r
                        this.upgradeTableLayoutPanel.Controls.Add(this.upgradeExcludeTextBox, 0, 1);\r
+                       this.upgradeTableLayoutPanel.Controls.Add(upgradeExcludeDescLabel, 0, 2);\r
                        this.upgradeTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.upgradeTableLayoutPanel.Location = new System.Drawing.Point(3, 3);\r
                        this.upgradeTableLayoutPanel.Name = "upgradeTableLayoutPanel";\r
                        this.upgradeTableLayoutPanel.RowCount = 3;\r
                        this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
-                       this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-                       this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
+                       this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.upgradeTableLayoutPanel.Size = new System.Drawing.Size(440, 209);\r
                        this.upgradeTableLayoutPanel.TabIndex = 0;\r
                        // \r
@@ -599,7 +601,6 @@
                        this.upgradeExcludeLabel.Size = new System.Drawing.Size(434, 12);\r
                        this.upgradeExcludeLabel.TabIndex = 0;\r
                        this.upgradeExcludeLabel.Text = "除外するソフトのリスト(&E)";\r
-                       this.toolTip.SetToolTip(this.upgradeExcludeLabel, "除外するソフト名称を改行区切りで入力します。");\r
                        // \r
                        // upgradeExcludeTextBox\r
                        // \r
@@ -609,10 +610,20 @@
                        this.upgradeExcludeTextBox.Multiline = true;\r
                        this.upgradeExcludeTextBox.Name = "upgradeExcludeTextBox";\r
                        this.upgradeExcludeTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;\r
-                       this.upgradeExcludeTextBox.Size = new System.Drawing.Size(434, 171);\r
+                       this.upgradeExcludeTextBox.Size = new System.Drawing.Size(434, 179);\r
                        this.upgradeExcludeTextBox.TabIndex = 0;\r
                        this.upgradeExcludeTextBox.WordWrap = false;\r
                        // \r
+                       // upgradeExcludeDescLabel\r
+                       // \r
+                       upgradeExcludeDescLabel.AutoSize = true;\r
+                       upgradeExcludeDescLabel.Dock = System.Windows.Forms.DockStyle.Fill;\r
+                       upgradeExcludeDescLabel.Location = new System.Drawing.Point(3, 197);\r
+                       upgradeExcludeDescLabel.Name = "upgradeExcludeDescLabel";\r
+                       upgradeExcludeDescLabel.Size = new System.Drawing.Size(434, 12);\r
+                       upgradeExcludeDescLabel.TabIndex = 1;\r
+                       upgradeExcludeDescLabel.Text = "除外するソフト名称を改行で区切って入力します。";\r
+                       // \r
                        // errorProvider\r
                        // \r
                        this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.AlwaysBlink;\r

diff --git a/AppliStation/UserPrefForm.resx b/AppliStation/UserPrefForm.resx
index 0df3a38..d8a1879 100644 (file)
--- a/AppliStation/UserPrefForm.resx
+++ b/AppliStation/UserPrefForm.resx
@@ -120,6 +120,9 @@
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>17, 17</value>\r
   </metadata>\r
+  <metadata name="upgradeExcludeDescLabel.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>False</value>\r
+  </metadata>\r
   <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>104, 17</value>\r
   </metadata>\r