OSDN Git Service

AppliStation-GUI,進捗ダイアログのログテキスト表示領域がインストーラーファイルをダウンロードしているときに表示領域がカクカクする不具合を修正(その2...
[applistation/AppliStation.git] / AppliStation / AppliStation.Util / ExecutionProgressViewer.Designer.cs
index 3979fd2..0296c7b 100644 (file)
@@ -29,16 +29,19 @@ namespace AppliStation.Util
                /// </summary>\r
                private void InitializeComponent()\r
                {\r
+                       this.components = new System.ComponentModel.Container();\r
                        this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
                        this.progressSubLabel = new System.Windows.Forms.Label();\r
-                       this.subtitleLabel = new System.Windows.Forms.Label();\r
-                       this.progressBar = new System.Windows.Forms.ProgressBar();\r
                        this.progressLabel = new System.Windows.Forms.Label();\r
+                       this.progressBar = new System.Windows.Forms.ProgressBar();\r
                        this.progressBarSub = new System.Windows.Forms.ProgressBar();\r
                        this.bottomPanel = new System.Windows.Forms.FlowLayoutPanel();\r
+                       this.autoCloseCheckBox = new System.Windows.Forms.CheckBox();\r
                        this.okButton = new System.Windows.Forms.Button();\r
                        this.cancelButton = new System.Windows.Forms.Button();\r
                        this.logBox = new System.Windows.Forms.RichTextBox();\r
+                       this.autoCloseTimer = new System.Windows.Forms.Timer(this.components);\r
+                       this.toolTip = new System.Windows.Forms.ToolTip(this.components);\r
                        this.tableLayoutPanel1.SuspendLayout();\r
                        this.bottomPanel.SuspendLayout();\r
                        this.SuspendLayout();\r
@@ -47,18 +50,16 @@ 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.Controls.Add(this.progressSubLabel, 0, 5);\r
-                       this.tableLayoutPanel1.Controls.Add(this.subtitleLabel, 0, 0);\r
+                       this.tableLayoutPanel1.Controls.Add(this.progressSubLabel, 0, 3);\r
+                       this.tableLayoutPanel1.Controls.Add(this.progressLabel, 0, 0);\r
                        this.tableLayoutPanel1.Controls.Add(this.progressBar, 0, 1);\r
-                       this.tableLayoutPanel1.Controls.Add(this.progressLabel, 0, 2);\r
                        this.tableLayoutPanel1.Controls.Add(this.progressBarSub, 0, 4);\r
-                       this.tableLayoutPanel1.Controls.Add(this.bottomPanel, 0, 7);\r
-                       this.tableLayoutPanel1.Controls.Add(this.logBox, 0, 6);\r
+                       this.tableLayoutPanel1.Controls.Add(this.bottomPanel, 0, 6);\r
+                       this.tableLayoutPanel1.Controls.Add(this.logBox, 0, 5);\r
                        this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        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, 40F));\r
+                       this.tableLayoutPanel1.RowCount = 7;\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
@@ -66,29 +67,36 @@ namespace AppliStation.Util
                        this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+                       this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.tableLayoutPanel1.Size = new System.Drawing.Size(444, 318);\r
                        this.tableLayoutPanel1.TabIndex = 0;\r
                        // \r
                        // progressSubLabel\r
                        // \r
+                       this.progressSubLabel.AutoEllipsis = true;\r
                        this.progressSubLabel.Dock = System.Windows.Forms.DockStyle.Fill;\r
-                       this.progressSubLabel.Location = new System.Drawing.Point(3, 118);\r
+                       this.progressSubLabel.Font = System.Drawing.SystemFonts.CaptionFont;\r
+                       this.progressSubLabel.Location = new System.Drawing.Point(3, 66);\r
                        this.progressSubLabel.Name = "progressSubLabel";\r
                        this.progressSubLabel.Size = new System.Drawing.Size(438, 26);\r
                        this.progressSubLabel.TabIndex = 6;\r
                        this.progressSubLabel.Text = "しばらくお待ちください...";\r
+                       this.progressSubLabel.TextAlign = System.Drawing.ContentAlignment.BottomLeft;\r
                        this.progressSubLabel.UseMnemonic = false;\r
                        this.progressSubLabel.Visible = false;\r
                        // \r
-                       // subtitleLabel\r
+                       // progressLabel\r
                        // \r
-                       this.subtitleLabel.Dock = System.Windows.Forms.DockStyle.Bottom;\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
-                       this.subtitleLabel.Text = "しばらくお待ちください...";\r
-                       this.subtitleLabel.UseMnemonic = false;\r
+                       this.progressLabel.AutoEllipsis = true;\r
+                       this.progressLabel.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+                       this.progressLabel.Font = System.Drawing.SystemFonts.CaptionFont;\r
+                       this.progressLabel.Location = new System.Drawing.Point(3, 17);\r
+                       this.progressLabel.Name = "progressLabel";\r
+                       this.progressLabel.Size = new System.Drawing.Size(438, 23);\r
+                       this.progressLabel.TabIndex = 0;\r
+                       this.progressLabel.Text = "しばらくお待ちください...";\r
+                       this.progressLabel.TextAlign = System.Drawing.ContentAlignment.BottomLeft;\r
+                       this.progressLabel.UseMnemonic = false;\r
                        // \r
                        // progressBar\r
                        // \r
@@ -99,16 +107,6 @@ namespace AppliStation.Util
                        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(3, 66);\r
-                       this.progressLabel.Name = "progressLabel";\r
-                       this.progressLabel.Size = new System.Drawing.Size(438, 26);\r
-                       this.progressLabel.TabIndex = 3;\r
-                       this.progressLabel.Text = "しばらくお待ちください...";\r
-                       this.progressLabel.UseMnemonic = false;\r
-                       // \r
                        // progressBarSub\r
                        // \r
                        this.progressBarSub.Dock = System.Windows.Forms.DockStyle.Top;\r
@@ -122,18 +120,31 @@ namespace AppliStation.Util
                        // bottomPanel\r
                        // \r
                        this.bottomPanel.AutoSize = true;\r
+                       this.bottomPanel.Controls.Add(this.autoCloseCheckBox);\r
                        this.bottomPanel.Controls.Add(this.okButton);\r
                        this.bottomPanel.Controls.Add(this.cancelButton);\r
                        this.bottomPanel.Dock = System.Windows.Forms.DockStyle.Right;\r
-                       this.bottomPanel.Location = new System.Drawing.Point(279, 286);\r
+                       this.bottomPanel.Location = new System.Drawing.Point(100, 286);\r
                        this.bottomPanel.Name = "bottomPanel";\r
-                       this.bottomPanel.Size = new System.Drawing.Size(162, 29);\r
+                       this.bottomPanel.Size = new System.Drawing.Size(341, 29);\r
                        this.bottomPanel.TabIndex = 4;\r
                        // \r
+                       // autoCloseCheckBox\r
+                       // \r
+                       this.autoCloseCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
+                       this.autoCloseCheckBox.AutoSize = true;\r
+                       this.autoCloseCheckBox.Checked = true;\r
+                       this.autoCloseCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;\r
+                       this.autoCloseCheckBox.Location = new System.Drawing.Point(3, 6);\r
+                       this.autoCloseCheckBox.Name = "autoCloseCheckBox";\r
+                       this.autoCloseCheckBox.Size = new System.Drawing.Size(173, 16);\r
+                       this.autoCloseCheckBox.TabIndex = 2;\r
+                       this.autoCloseCheckBox.Text = "正常終了時に自動で閉じる(&A)";\r
+                       // \r
                        // okButton\r
                        // \r
                        this.okButton.Enabled = false;\r
-                       this.okButton.Location = new System.Drawing.Point(3, 3);\r
+                       this.okButton.Location = new System.Drawing.Point(182, 3);\r
                        this.okButton.Name = "okButton";\r
                        this.okButton.Size = new System.Drawing.Size(75, 23);\r
                        this.okButton.TabIndex = 0;\r
@@ -144,7 +155,7 @@ namespace AppliStation.Util
                        // cancelButton\r
                        // \r
                        this.cancelButton.Enabled = false;\r
-                       this.cancelButton.Location = new System.Drawing.Point(84, 3);\r
+                       this.cancelButton.Location = new System.Drawing.Point(263, 3);\r
                        this.cancelButton.Name = "cancelButton";\r
                        this.cancelButton.Size = new System.Drawing.Size(75, 23);\r
                        this.cancelButton.TabIndex = 1;\r
@@ -154,17 +165,23 @@ namespace AppliStation.Util
                        // \r
                        // logBox\r
                        // \r
-                       this.logBox.BackColor = System.Drawing.SystemColors.Control;\r
                        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(3, 147);\r
+                       this.logBox.Layout += new System.Windows.Forms.LayoutEventHandler(this.LogBoxTextLayouted);\r
+                       this.logBox.Location = new System.Drawing.Point(3, 121);\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(438, 133);\r
+                       this.logBox.Size = new System.Drawing.Size(438, 159);\r
                        this.logBox.TabIndex = 8;\r
                        this.logBox.Text = "";\r
+                       this.logBox.TextChanged += new System.EventHandler(this.LogBoxTextChanged);\r
+                       // \r
+                       // autoCloseTimer\r
+                       // \r
+                       this.autoCloseTimer.Interval = 3000;\r
+                       this.autoCloseTimer.Tick += new System.EventHandler(this.AutoCloseTimerTick);\r
                        // \r
                        // ExecutionProgressViewer\r
                        // \r
@@ -177,20 +194,24 @@ namespace AppliStation.Util
                        this.Name = "ExecutionProgressViewer";\r
                        this.Text = "AppliStation";\r
                        this.Shown += new System.EventHandler(this.ExecutionProgressViewerShown);\r
+                       this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ExecutionProgressViewerFormClosed);\r
                        this.tableLayoutPanel1.ResumeLayout(false);\r
                        this.tableLayoutPanel1.PerformLayout();\r
                        this.bottomPanel.ResumeLayout(false);\r
+                       this.bottomPanel.PerformLayout();\r
                        this.ResumeLayout(false);\r
                }\r
+               private System.Windows.Forms.Label progressLabel;\r
+               private System.Windows.Forms.ToolTip toolTip;\r
+               private System.Windows.Forms.Timer autoCloseTimer;\r
+               private System.Windows.Forms.CheckBox autoCloseCheckBox;\r
                private System.Windows.Forms.Button cancelButton;\r
                private System.Windows.Forms.Button okButton;\r
                private System.Windows.Forms.RichTextBox logBox;\r
                private System.Windows.Forms.Label progressSubLabel;\r
                private System.Windows.Forms.ProgressBar progressBarSub;\r
                private System.Windows.Forms.FlowLayoutPanel bottomPanel;\r
-               private System.Windows.Forms.Label progressLabel;\r
                private System.Windows.Forms.ProgressBar progressBar;\r
-               private System.Windows.Forms.Label subtitleLabel;\r
                private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;\r
        }\r
 }\r