AppliStation-GUI,進捗ダイアログでのコンポーネント部品配置の改良

git-svn-id: http://localhost/svn/AppliStation/trunk@918 34ed2c89-c49f-4a4b-abdb-c318350108cf

diff --git a/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs b/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs
index fe8ef84..3019ef4 100644 (file)
--- a/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs
+++ b/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs
@@ -47,7 +47,6 @@ namespace AppliStation.Util
                        // \r
                        this.tableLayoutPanel1.ColumnCount = 1;\r
                        this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
-                       this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
                        this.tableLayoutPanel1.Controls.Add(this.progressSubLabel, 0, 5);\r
                        this.tableLayoutPanel1.Controls.Add(this.subtitleLabel, 0, 0);\r
                        this.tableLayoutPanel1.Controls.Add(this.progressBar, 0, 1);\r
@@ -59,7 +58,7 @@ namespace AppliStation.Util
                        this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);\r
                        this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
                        this.tableLayoutPanel1.RowCount = 8;\r
-                       this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F));\r
+                       this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));\r
                        this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
@@ -73,10 +72,9 @@ namespace AppliStation.Util
                        // progressSubLabel\r
                        // \r
                        this.progressSubLabel.Dock = System.Windows.Forms.DockStyle.Fill;\r
-                       this.progressSubLabel.Location = new System.Drawing.Point(10, 128);\r
-                       this.progressSubLabel.Margin = new System.Windows.Forms.Padding(10, 0, 3, 0);\r
+                       this.progressSubLabel.Location = new System.Drawing.Point(3, 118);\r
                        this.progressSubLabel.Name = "progressSubLabel";\r
-                       this.progressSubLabel.Size = new System.Drawing.Size(431, 26);\r
+                       this.progressSubLabel.Size = new System.Drawing.Size(438, 26);\r
                        this.progressSubLabel.TabIndex = 6;\r
                        this.progressSubLabel.Text = "しばらくお待ちください...";\r
                        this.progressSubLabel.Visible = false;\r
@@ -84,7 +82,7 @@ namespace AppliStation.Util
                        // subtitleLabel\r
                        // \r
                        this.subtitleLabel.Dock = System.Windows.Forms.DockStyle.Bottom;\r
-                       this.subtitleLabel.Location = new System.Drawing.Point(3, 27);\r
+                       this.subtitleLabel.Location = new System.Drawing.Point(3, 17);\r
                        this.subtitleLabel.Name = "subtitleLabel";\r
                        this.subtitleLabel.Size = new System.Drawing.Size(438, 23);\r
                        this.subtitleLabel.TabIndex = 0;\r
@@ -93,30 +91,27 @@ namespace AppliStation.Util
                        // progressBar\r
                        // \r
                        this.progressBar.Dock = System.Windows.Forms.DockStyle.Top;\r
-                       this.progressBar.Location = new System.Drawing.Point(10, 53);\r
-                       this.progressBar.Margin = new System.Windows.Forms.Padding(10, 3, 10, 3);\r
+                       this.progressBar.Location = new System.Drawing.Point(3, 43);\r
                        this.progressBar.Name = "progressBar";\r
-                       this.progressBar.Size = new System.Drawing.Size(424, 20);\r
+                       this.progressBar.Size = new System.Drawing.Size(438, 20);\r
                        this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Marquee;\r
                        this.progressBar.TabIndex = 2;\r
                        // \r
                        // progressLabel\r
                        // \r
                        this.progressLabel.Dock = System.Windows.Forms.DockStyle.Fill;\r
-                       this.progressLabel.Location = new System.Drawing.Point(10, 76);\r
-                       this.progressLabel.Margin = new System.Windows.Forms.Padding(10, 0, 3, 0);\r
+                       this.progressLabel.Location = new System.Drawing.Point(3, 66);\r
                        this.progressLabel.Name = "progressLabel";\r
-                       this.progressLabel.Size = new System.Drawing.Size(431, 26);\r
+                       this.progressLabel.Size = new System.Drawing.Size(438, 26);\r
                        this.progressLabel.TabIndex = 3;\r
                        this.progressLabel.Text = "しばらくお待ちください...";\r
                        // \r
                        // progressBarSub\r
                        // \r
                        this.progressBarSub.Dock = System.Windows.Forms.DockStyle.Top;\r
-                       this.progressBarSub.Location = new System.Drawing.Point(10, 105);\r
-                       this.progressBarSub.Margin = new System.Windows.Forms.Padding(10, 3, 10, 3);\r
+                       this.progressBarSub.Location = new System.Drawing.Point(3, 95);\r
                        this.progressBarSub.Name = "progressBarSub";\r
-                       this.progressBarSub.Size = new System.Drawing.Size(424, 20);\r
+                       this.progressBarSub.Size = new System.Drawing.Size(438, 20);\r
                        this.progressBarSub.Style = System.Windows.Forms.ProgressBarStyle.Continuous;\r
                        this.progressBarSub.TabIndex = 5;\r
                        this.progressBarSub.Visible = false;\r
@@ -145,6 +140,7 @@ namespace AppliStation.Util
                        // \r
                        // cancelButton\r
                        // \r
+                       this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;\r
                        this.cancelButton.Enabled = false;\r
                        this.cancelButton.Location = new System.Drawing.Point(84, 3);\r
                        this.cancelButton.Name = "cancelButton";\r
@@ -160,12 +156,11 @@ namespace AppliStation.Util
                        this.logBox.DetectUrls = false;\r
                        this.logBox.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.logBox.ForeColor = System.Drawing.SystemColors.ControlText;\r
-                       this.logBox.Location = new System.Drawing.Point(10, 157);\r
-                       this.logBox.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3);\r
+                       this.logBox.Location = new System.Drawing.Point(3, 147);\r
                        this.logBox.Name = "logBox";\r
                        this.logBox.ReadOnly = true;\r
                        this.logBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.ForcedVertical;\r
-                       this.logBox.Size = new System.Drawing.Size(431, 123);\r
+                       this.logBox.Size = new System.Drawing.Size(438, 133);\r
                        this.logBox.TabIndex = 8;\r
                        this.logBox.Text = "";\r
                        // \r
@@ -174,6 +169,7 @@ namespace AppliStation.Util
                        this.AcceptButton = this.okButton;\r
                        this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r
                        this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
+                       this.CancelButton = this.cancelButton;\r
                        this.ClientSize = new System.Drawing.Size(444, 318);\r
                        this.Controls.Add(this.tableLayoutPanel1);\r
                        this.MaximizeBox = false;\r