AppliStation-GUI,パッケージ情報表示ダイアログにパッケージリスト名を追加

diff --git a/AppliStation/PackageInfoForm.Designer.cs b/AppliStation/PackageInfoForm.Designer.cs
index 59537db..8c05a04 100644 (file)
--- a/AppliStation/PackageInfoForm.Designer.cs
+++ b/AppliStation/PackageInfoForm.Designer.cs
@@ -45,6 +45,8 @@
                        this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();\r
                        this.stateLabel = new System.Windows.Forms.Label();\r
                        this.statusLinkLabel = new System.Windows.Forms.LinkLabel();\r
+                       this.packageListNameLabel = new System.Windows.Forms.Label();\r
+                       this.packageListNameValueLabel = new System.Windows.Forms.Label();\r
                        this.flowLayoutPanel1.SuspendLayout();\r
                        this.tableLayoutPanel.SuspendLayout();\r
                        this.SuspendLayout();\r
@@ -135,10 +137,8 @@
                        // \r
                        // tagsTextBox\r
                        // \r
-                       this.tagsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
-                                                                       | System.Windows.Forms.AnchorStyles.Left) \r
-                                                                       | System.Windows.Forms.AnchorStyles.Right)));\r
                        this.tagsTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
+                       this.tagsTextBox.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.tagsTextBox.Location = new System.Drawing.Point(130, 105);\r
                        this.tagsTextBox.Name = "tagsTextBox";\r
                        this.tagsTextBox.ReadOnly = true;\r
@@ -180,10 +180,10 @@
                        // \r
                        this.tableLayoutPanel.SetColumnSpan(this.tabControl1, 2);\r
                        this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;\r
-                       this.tabControl1.Location = new System.Drawing.Point(11, 147);\r
+                       this.tabControl1.Location = new System.Drawing.Point(11, 159);\r
                        this.tabControl1.Name = "tabControl1";\r
                        this.tabControl1.SelectedIndex = 0;\r
-                       this.tabControl1.Size = new System.Drawing.Size(370, 165);\r
+                       this.tabControl1.Size = new System.Drawing.Size(370, 153);\r
                        this.tabControl1.TabIndex = 12;\r
                        // \r
                        // closeButton\r
@@ -205,23 +205,26 @@
                        this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        this.tableLayoutPanel.Controls.Add(this.stateLabel, 0, 2);\r
                        this.tableLayoutPanel.Controls.Add(this.typeValueLabel, 1, 6);\r
-                       this.tableLayoutPanel.Controls.Add(this.tabControl1, 0, 7);\r
+                       this.tableLayoutPanel.Controls.Add(this.tabControl1, 0, 8);\r
                        this.tableLayoutPanel.Controls.Add(this.licenseLinkLabel, 1, 5);\r
                        this.tableLayoutPanel.Controls.Add(this.flowLayoutPanel1, 0, 0);\r
                        this.tableLayoutPanel.Controls.Add(this.summaryTextBox, 0, 1);\r
                        this.tableLayoutPanel.Controls.Add(this.tagsTextBox, 1, 4);\r
-                       this.tableLayoutPanel.Controls.Add(this.closeButton, 1, 8);\r
+                       this.tableLayoutPanel.Controls.Add(this.closeButton, 1, 9);\r
                        this.tableLayoutPanel.Controls.Add(this.typeLabel, 0, 6);\r
                        this.tableLayoutPanel.Controls.Add(this.licenseLabel, 0, 5);\r
                        this.tableLayoutPanel.Controls.Add(this.tagsLabel, 0, 4);\r
                        this.tableLayoutPanel.Controls.Add(this.urlLabel, 0, 3);\r
                        this.tableLayoutPanel.Controls.Add(this.urlLinkLabel, 1, 3);\r
                        this.tableLayoutPanel.Controls.Add(this.statusLinkLabel, 1, 2);\r
+                       this.tableLayoutPanel.Controls.Add(this.packageListNameLabel, 0, 7);\r
+                       this.tableLayoutPanel.Controls.Add(this.packageListNameValueLabel, 1, 7);\r
                        this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.tableLayoutPanel.Location = new System.Drawing.Point(0, 0);\r
                        this.tableLayoutPanel.Name = "tableLayoutPanel";\r
                        this.tableLayoutPanel.Padding = new System.Windows.Forms.Padding(8);\r
-                       this.tableLayoutPanel.RowCount = 9;\r
+                       this.tableLayoutPanel.RowCount = 10;\r
+                       this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
@@ -259,6 +262,26 @@
                        this.statusLinkLabel.VisitedLinkColor = System.Drawing.SystemColors.HotTrack;\r
                        this.statusLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelLinkClicked);\r
                        // \r
+                       // packageListNameLabel\r
+                       // \r
+                       this.packageListNameLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+                       this.packageListNameLabel.AutoSize = true;\r
+                       this.packageListNameLabel.Location = new System.Drawing.Point(11, 144);\r
+                       this.packageListNameLabel.Name = "packageListNameLabel";\r
+                       this.packageListNameLabel.Size = new System.Drawing.Size(93, 12);\r
+                       this.packageListNameLabel.TabIndex = 14;\r
+                       this.packageListNameLabel.Text = "パッケージリスト名：";\r
+                       // \r
+                       // packageListNameValueLabel\r
+                       // \r
+                       this.packageListNameValueLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;\r
+                       this.packageListNameValueLabel.AutoSize = true;\r
+                       this.packageListNameValueLabel.Location = new System.Drawing.Point(130, 144);\r
+                       this.packageListNameValueLabel.Name = "packageListNameValueLabel";\r
+                       this.packageListNameValueLabel.Size = new System.Drawing.Size(41, 12);\r
+                       this.packageListNameValueLabel.TabIndex = 14;\r
+                       this.packageListNameValueLabel.Text = "（不明）";\r
+                       // \r
                        // PackageInfoForm\r
                        // \r
                        this.AcceptButton = this.closeButton;\r
@@ -277,6 +300,8 @@
                        this.tableLayoutPanel.PerformLayout();\r
                        this.ResumeLayout(false);\r
                }\r
+               private System.Windows.Forms.Label packageListNameValueLabel;\r
+               private System.Windows.Forms.Label packageListNameLabel;\r
                private System.Windows.Forms.LinkLabel statusLinkLabel;\r
                private System.Windows.Forms.Label stateLabel;\r
                private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;\r

diff --git a/AppliStation/PackageInfoForm.cs b/AppliStation/PackageInfoForm.cs
index 4aeb081..69409f1 100644 (file)
--- a/AppliStation/PackageInfoForm.cs
+++ b/AppliStation/PackageInfoForm.cs
@@ -74,6 +74,8 @@ namespace AppliStation
                        if (pkg.Url != null) {\r
                                urlLinkLabel.Text = pkg.Url.Href;\r
                                urlLinkLabel.Links.Add(0, pkg.Url.Href.Length, pkg.Url.Href);\r
+                               urlLinkLabel.Enabled = true;\r
+                               urlLabel.Enabled = true;\r
                        } else {\r
                                urlLinkLabel.Text = string.Empty;\r
                                urlLinkLabel.Enabled = false;\r
@@ -82,6 +84,14 @@ namespace AppliStation
                        tagsTextBox.Text = pkg.Tags;\r
                        setLinkLabelFromLicense(licenseLinkLabel, pkg.License, (pkg.Url!=null)?pkg.Url.Href:string.Empty);\r
                        setTypeValueLabel(typeValueLabel, pkg.Type);\r
+                       if (! string.IsNullOrEmpty(pkg.PackageListName)) {\r
+                               packageListNameValueLabel.Text = pkg.PackageListName;\r
+                               packageListNameLabel.Enabled = true;\r
+                               packageListNameValueLabel.Enabled = true;\r
+                       } else {\r
+                               packageListNameLabel.Enabled = false;\r
+                               packageListNameValueLabel.Enabled = false;\r
+                       }\r
                        \r
                        tabControl1.TabPages.Clear();\r
                        if (pkg is InstalledPackage && string.IsNullOrEmpty(pkg.Version)) {\r