X-Git-Url: http://git.sourceforge.jp/view?p=applistation%2FAppliStation.git;a=blobdiff_plain;f=AppliStation%2FAppliStation.Util%2FExecutionProgressViewer.Designer.cs;h=0296c7bfad46f01f3bcff2c2fb48d249ae347d8d;hp=1c625aecb2bf4f5dbcbcf616551fa85beab1b95d;hb=5f97683021498f777ca0a733d7d3b2465d71b0f1;hpb=296abf9d92b8be2970b21b5eee2e8cdd097c1d32;ds=sidebyside

diff --git a/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs b/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs
index 1c625ae..0296c7b 100644
--- a/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs
+++ b/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs
@@ -32,9 +32,8 @@ namespace AppliStation.Util
 			this.components = new System.ComponentModel.Container();
 			this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
 			this.progressSubLabel = new System.Windows.Forms.Label();
-			this.subtitleLabel = new System.Windows.Forms.Label();
-			this.progressBar = new System.Windows.Forms.ProgressBar();
 			this.progressLabel = new System.Windows.Forms.Label();
+			this.progressBar = new System.Windows.Forms.ProgressBar();
 			this.progressBarSub = new System.Windows.Forms.ProgressBar();
 			this.bottomPanel = new System.Windows.Forms.FlowLayoutPanel();
 			this.autoCloseCheckBox = new System.Windows.Forms.CheckBox();
@@ -51,18 +50,16 @@ namespace AppliStation.Util
 			// 
 			this.tableLayoutPanel1.ColumnCount = 1;
 			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-			this.tableLayoutPanel1.Controls.Add(this.progressSubLabel, 0, 5);
-			this.tableLayoutPanel1.Controls.Add(this.subtitleLabel, 0, 0);
+			this.tableLayoutPanel1.Controls.Add(this.progressSubLabel, 0, 3);
+			this.tableLayoutPanel1.Controls.Add(this.progressLabel, 0, 0);
 			this.tableLayoutPanel1.Controls.Add(this.progressBar, 0, 1);
-			this.tableLayoutPanel1.Controls.Add(this.progressLabel, 0, 2);
 			this.tableLayoutPanel1.Controls.Add(this.progressBarSub, 0, 4);
-			this.tableLayoutPanel1.Controls.Add(this.bottomPanel, 0, 7);
-			this.tableLayoutPanel1.Controls.Add(this.logBox, 0, 6);
+			this.tableLayoutPanel1.Controls.Add(this.bottomPanel, 0, 6);
+			this.tableLayoutPanel1.Controls.Add(this.logBox, 0, 5);
 			this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
 			this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-			this.tableLayoutPanel1.RowCount = 8;
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
+			this.tableLayoutPanel1.RowCount = 7;
 			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
 			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
 			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
@@ -70,29 +67,36 @@ namespace AppliStation.Util
 			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
 			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
 			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
 			this.tableLayoutPanel1.Size = new System.Drawing.Size(444, 318);
 			this.tableLayoutPanel1.TabIndex = 0;
 			// 
 			// progressSubLabel
 			// 
+			this.progressSubLabel.AutoEllipsis = true;
 			this.progressSubLabel.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.progressSubLabel.Location = new System.Drawing.Point(3, 118);
+			this.progressSubLabel.Font = System.Drawing.SystemFonts.CaptionFont;
+			this.progressSubLabel.Location = new System.Drawing.Point(3, 66);
 			this.progressSubLabel.Name = "progressSubLabel";
 			this.progressSubLabel.Size = new System.Drawing.Size(438, 26);
 			this.progressSubLabel.TabIndex = 6;
 			this.progressSubLabel.Text = "しばらくお待ちください...";
+			this.progressSubLabel.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
 			this.progressSubLabel.UseMnemonic = false;
 			this.progressSubLabel.Visible = false;
 			// 
-			// subtitleLabel
+			// progressLabel
 			// 
-			this.subtitleLabel.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.subtitleLabel.Location = new System.Drawing.Point(3, 17);
-			this.subtitleLabel.Name = "subtitleLabel";
-			this.subtitleLabel.Size = new System.Drawing.Size(438, 23);
-			this.subtitleLabel.TabIndex = 0;
-			this.subtitleLabel.Text = "しばらくお待ちください...";
-			this.subtitleLabel.UseMnemonic = false;
+			this.progressLabel.AutoEllipsis = true;
+			this.progressLabel.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.progressLabel.Font = System.Drawing.SystemFonts.CaptionFont;
+			this.progressLabel.Location = new System.Drawing.Point(3, 17);
+			this.progressLabel.Name = "progressLabel";
+			this.progressLabel.Size = new System.Drawing.Size(438, 23);
+			this.progressLabel.TabIndex = 0;
+			this.progressLabel.Text = "しばらくお待ちください...";
+			this.progressLabel.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+			this.progressLabel.UseMnemonic = false;
 			// 
 			// progressBar
 			// 
@@ -103,16 +107,6 @@ namespace AppliStation.Util
 			this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
 			this.progressBar.TabIndex = 2;
 			// 
-			// progressLabel
-			// 
-			this.progressLabel.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.progressLabel.Location = new System.Drawing.Point(3, 66);
-			this.progressLabel.Name = "progressLabel";
-			this.progressLabel.Size = new System.Drawing.Size(438, 26);
-			this.progressLabel.TabIndex = 3;
-			this.progressLabel.Text = "しばらくお待ちください...";
-			this.progressLabel.UseMnemonic = false;
-			// 
 			// progressBarSub
 			// 
 			this.progressBarSub.Dock = System.Windows.Forms.DockStyle.Top;
@@ -174,13 +168,15 @@ namespace AppliStation.Util
 			this.logBox.DetectUrls = false;
 			this.logBox.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.logBox.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.logBox.Location = new System.Drawing.Point(3, 147);
+			this.logBox.Layout += new System.Windows.Forms.LayoutEventHandler(this.LogBoxTextLayouted);
+			this.logBox.Location = new System.Drawing.Point(3, 121);
 			this.logBox.Name = "logBox";
 			this.logBox.ReadOnly = true;
 			this.logBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.ForcedVertical;
-			this.logBox.Size = new System.Drawing.Size(438, 133);
+			this.logBox.Size = new System.Drawing.Size(438, 159);
 			this.logBox.TabIndex = 8;
 			this.logBox.Text = "";
+			this.logBox.TextChanged += new System.EventHandler(this.LogBoxTextChanged);
 			// 
 			// autoCloseTimer
 			// 
@@ -205,6 +201,7 @@ namespace AppliStation.Util
 			this.bottomPanel.PerformLayout();
 			this.ResumeLayout(false);
 		}
+		private System.Windows.Forms.Label progressLabel;
 		private System.Windows.Forms.ToolTip toolTip;
 		private System.Windows.Forms.Timer autoCloseTimer;
 		private System.Windows.Forms.CheckBox autoCloseCheckBox;
@@ -214,9 +211,7 @@ namespace AppliStation.Util
 		private System.Windows.Forms.Label progressSubLabel;
 		private System.Windows.Forms.ProgressBar progressBarSub;
 		private System.Windows.Forms.FlowLayoutPanel bottomPanel;
-		private System.Windows.Forms.Label progressLabel;
 		private System.Windows.Forms.ProgressBar progressBar;
-		private System.Windows.Forms.Label subtitleLabel;
 		private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
 	}
 }