AppliStation-GUI,進捗ダイアログ型の表示の変更など

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

diff --git a/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs b/AppliStation/AppliStation.Util/ExecutionProgressViewer.Designer.cs
index 1c625ae..6b56390 100644 (file)
--- 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();\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
@@ -51,48 +50,49 @@ 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.RowCount = 7;\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
                        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(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(System.Windows.Forms.SizeType.Absolute, 20F));\r
                        this.tableLayoutPanel1.Size = new System.Drawing.Size(444, 318);\r
                        this.tableLayoutPanel1.TabIndex = 0;\r
                        // \r
                        // progressSubLabel\r
                        // \r
                        this.progressSubLabel.Dock = System.Windows.Forms.DockStyle.Fill;\r
-                       this.progressSubLabel.Location = new System.Drawing.Point(3, 118);\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.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.UseMnemonic = false;\r
                        // \r
                        // progressBar\r
                        // \r
@@ -103,16 +103,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
@@ -174,11 +164,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(3, 147);\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
                        // \r
@@ -205,6 +195,7 @@ namespace AppliStation.Util
                        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
@@ -214,9 +205,7 @@ namespace AppliStation.Util
                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

diff --git a/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs b/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
index 81fc944..fa6e0ea 100644 (file)
--- a/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
+++ b/AppliStation/AppliStation.Util/ExecutionProgressViewer.cs
@@ -95,7 +95,6 @@ namespace AppliStation.Util
                        } else {\r
                                progressBar.Style = ProgressBarStyle.Marquee;\r
                        }\r
-                       progressLabel.Text = e.TaskMessage ?? string.Empty;\r
                        \r
                        cancelButton.Enabled = taskSet.Running && taskSet.Cancelable;\r
                        \r
@@ -111,7 +110,7 @@ namespace AppliStation.Util
                                        }\r
                                        break;\r
                                case NaGetTaskSetEventType.STARTED_TASKSET:\r
-                                       subtitleLabel.Text = taskSet.TaskSetNames[taskSet.CurrentTaskSetIndex];\r
+                                       progressLabel.Text = taskSet.TaskSetNames[taskSet.CurrentTaskSetIndex];\r
                                        logBox.AppendText("  " + e.TaskMessage + System.Environment.NewLine);\r
                                        break;\r
                                case NaGetTaskSetEventType.COMPLETED_TASKSET:\r

diff --git a/AppliStation/PackageInfoForm.Designer.cs b/AppliStation/PackageInfoForm.Designer.cs
index 16651f5..59537db 100644 (file)
--- a/AppliStation/PackageInfoForm.Designer.cs
+++ b/AppliStation/PackageInfoForm.Designer.cs
@@ -86,6 +86,7 @@
                        this.licenseLinkLabel.Name = "licenseLinkLabel";\r
                        this.licenseLinkLabel.Size = new System.Drawing.Size(0, 12);\r
                        this.licenseLinkLabel.TabIndex = 9;\r
+                       this.licenseLinkLabel.VisitedLinkColor = System.Drawing.SystemColors.HotTrack;\r
                        this.licenseLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelLinkClicked);\r
                        // \r
                        // licenseLabel\r
@@ -129,6 +130,7 @@
                        this.urlLinkLabel.TabIndex = 5;\r
                        this.urlLinkLabel.TabStop = true;\r
                        this.urlLinkLabel.Text = "http://";\r
+                       this.urlLinkLabel.VisitedLinkColor = System.Drawing.SystemColors.HotTrack;\r
                        this.urlLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelLinkClicked);\r
                        // \r
                        // tagsTextBox\r
@@ -254,6 +256,7 @@
                        this.statusLinkLabel.TabIndex = 3;\r
                        this.statusLinkLabel.TabStop = true;\r
                        this.statusLinkLabel.Text = "インストールされていません";\r
+                       this.statusLinkLabel.VisitedLinkColor = System.Drawing.SystemColors.HotTrack;\r
                        this.statusLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelLinkClicked);\r
                        // \r
                        // PackageInfoForm\r

diff --git a/AppliStation/PackageInfoForm.cs b/AppliStation/PackageInfoForm.cs
index 1f73295..db12b09 100644 (file)
--- a/AppliStation/PackageInfoForm.cs
+++ b/AppliStation/PackageInfoForm.cs
@@ -45,7 +45,7 @@ namespace AppliStation
                                }\r
                        }\r
                        nameLabel.Text = string.Format("{0} ({1})", pkg.Name, pkg.Version);\r
-                       nameLabel.Font = new Font(SystemFonts.DefaultFont.FontFamily, SystemFonts.DefaultFont.Size*1.5f);\r
+                       nameLabel.Font = new Font(SystemFonts.CaptionFont.FontFamily, SystemFonts.CaptionFont.Size*1.25f);\r
                        \r
                        summaryTextBox.Text = pkg.Summary;\r
                        \r