AppliStation-GUI,インストール除外リストの設定テキストアリアに改行が挿入できない問題の修正・レイアウト修正

diff --git a/AppliStation/UserPrefForm.Designer.cs b/AppliStation/UserPrefForm.Designer.cs
index 38d803b..765ed0d 100644 (file)
--- a/AppliStation/UserPrefForm.Designer.cs
+++ b/AppliStation/UserPrefForm.Designer.cs
@@ -67,7 +67,7 @@
                        this.cacheFolderOpenLinkLabel = new System.Windows.Forms.LinkLabel();\r
                        this.upgradeTabPage = new System.Windows.Forms.TabPage();\r
                        this.upgradeTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();\r
-                       this.upgradeExcludeGroupBox = new System.Windows.Forms.GroupBox();\r
+                       this.upgradeExcludeLabel = new System.Windows.Forms.Label();\r
                        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
@@ -86,7 +86,6 @@
                        this.cacheFolderTableLayoutPanel.SuspendLayout();\r
                        this.upgradeTabPage.SuspendLayout();\r
                        this.upgradeTableLayoutPanel.SuspendLayout();\r
-                       this.upgradeExcludeGroupBox.SuspendLayout();\r
                        ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();\r
                        this.SuspendLayout();\r
                        // \r
@@ -577,38 +576,40 @@
                        // upgradeTableLayoutPanel\r
                        // \r
                        this.upgradeTableLayoutPanel.ColumnCount = 1;\r
-                       this.upgradeTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));\r
-                       this.upgradeTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));\r
-                       this.upgradeTableLayoutPanel.Controls.Add(this.upgradeExcludeGroupBox, 0, 0);\r
+                       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.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 = 2;\r
-                       this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));\r
-                       this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));\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.Size = new System.Drawing.Size(440, 209);\r
                        this.upgradeTableLayoutPanel.TabIndex = 0;\r
                        // \r
-                       // upgradeExcludeGroupBox\r
+                       // upgradeExcludeLabel\r
                        // \r
-                       this.upgradeExcludeGroupBox.AutoSize = true;\r
-                       this.upgradeExcludeGroupBox.Controls.Add(this.upgradeExcludeTextBox);\r
-                       this.upgradeExcludeGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;\r
-                       this.upgradeExcludeGroupBox.Location = new System.Drawing.Point(3, 3);\r
-                       this.upgradeExcludeGroupBox.Name = "upgradeExcludeGroupBox";\r
-                       this.upgradeExcludeGroupBox.Size = new System.Drawing.Size(434, 98);\r
-                       this.upgradeExcludeGroupBox.TabIndex = 0;\r
-                       this.upgradeExcludeGroupBox.TabStop = false;\r
-                       this.upgradeExcludeGroupBox.Text = "ソフト更新から除外するソフト";\r
+                       this.upgradeExcludeLabel.AutoSize = true;\r
+                       this.upgradeExcludeLabel.Dock = System.Windows.Forms.DockStyle.Fill;\r
+                       this.upgradeExcludeLabel.Location = new System.Drawing.Point(3, 0);\r
+                       this.upgradeExcludeLabel.Name = "upgradeExcludeLabel";\r
+                       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
+                       this.upgradeExcludeTextBox.AcceptsReturn = true;\r
                        this.upgradeExcludeTextBox.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.upgradeExcludeTextBox.Location = new System.Drawing.Point(3, 15);\r
                        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(428, 80);\r
+                       this.upgradeExcludeTextBox.Size = new System.Drawing.Size(434, 171);\r
                        this.upgradeExcludeTextBox.TabIndex = 0;\r
                        this.upgradeExcludeTextBox.WordWrap = false;\r
                        // \r
@@ -655,13 +656,11 @@
                        this.upgradeTabPage.ResumeLayout(false);\r
                        this.upgradeTableLayoutPanel.ResumeLayout(false);\r
                        this.upgradeTableLayoutPanel.PerformLayout();\r
-                       this.upgradeExcludeGroupBox.ResumeLayout(false);\r
-                       this.upgradeExcludeGroupBox.PerformLayout();\r
                        ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();\r
                        this.ResumeLayout(false);\r
                }\r
+               private System.Windows.Forms.Label upgradeExcludeLabel;\r
                private System.Windows.Forms.TextBox upgradeExcludeTextBox;\r
-               private System.Windows.Forms.GroupBox upgradeExcludeGroupBox;\r
                private System.Windows.Forms.TableLayoutPanel upgradeTableLayoutPanel;\r
                private System.Windows.Forms.TabPage upgradeTabPage;\r
                private System.Windows.Forms.LinkLabel cacheFolderOpenLinkLabel;\r

diff --git a/AppliStation/UserPrefForm.resx b/AppliStation/UserPrefForm.resx
index 60c3fcf..0df3a38 100644 (file)
--- a/AppliStation/UserPrefForm.resx
+++ b/AppliStation/UserPrefForm.resx
@@ -120,9 +120,6 @@
   <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="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="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