AppliStation-GUI,パッケージリストの列で「ライセンス」と「インストールした日」を追加（デフォルト非表示）。

diff --git a/AppliStation/AppliStation.PackageInfo/PackageDescripter.cs b/AppliStation/AppliStation.PackageInfo/PackageDescripter.cs
index deffe69..a7428b9 100644 (file)
--- a/AppliStation/AppliStation.PackageInfo/PackageDescripter.cs
+++ b/AppliStation/AppliStation.PackageInfo/PackageDescripter.cs
@@ -195,6 +195,21 @@ namespace AppliStation.PackageInfo
                }\r
                \r
                /// <summary>\r
+               /// ライセンスのラベル文字列を生成する\r
+               /// </summary>\r
+               /// <param name="pkg">パッケージ</param>\r
+               /// <returns>ラベル文字列</returns>\r
+               public static string GetLicenseValueLabel(Package pkg)\r
+               {\r
+                       string label;\r
+                       LinkLabel.Link[] links;\r
+                       \r
+                       GetLicenseValueLabel(pkg, out label, out links);\r
+                       \r
+                       return label;\r
+               }\r
+               \r
+               /// <summary>\r
                /// リンクラベルのリンク生成便利メソッド\r
                /// </summary>\r
                /// <param name="text">ラベルテキスト</param>\r

diff --git a/AppliStation/PackageListView.cs b/AppliStation/PackageListView.cs
index 5c22ea3..2d4b1b1 100644 (file)
--- a/AppliStation/PackageListView.cs
+++ b/AppliStation/PackageListView.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel;\r
 using NaGet.Packages;\r
 using NaGet.Packages.Install;\r
+using AppliStation.PackageInfo;\r
 \r
 namespace AppliStation\r
 {\r
@@ -128,10 +129,18 @@ namespace AppliStation
                        string[] labels = new string[this.Columns.Count];\r
                        foreach (ColumnHeader header in this.Columns) {\r
                                string tag = header.Tag as string;\r
+                               \r
                                if (tag == "Name")                              labels[header.Index] = pkg.Name;\r
                                if (tag == "Version")                   labels[header.Index] = pkg.Version;\r
                                if (tag == "Summary")                   labels[header.Index] = pkg.Summary;\r
                                if (tag == "PackageListName")   labels[header.Index] = pkg.PackageListName;\r
+                               if (tag == "License")                   labels[header.Index] = PackageDescripter.GetLicenseValueLabel(pkg);\r
+                               if (tag == "InstallDate") {\r
+                                       InstalledPackage instPkg = pkg as InstalledPackage;\r
+                                       if (instPkg != null && instPkg.UninstallInfo.InstallDate.HasValue) {\r
+                                               labels[header.Index] = instPkg.UninstallInfo.InstallDate.Value.ToShortDateString();\r
+                                       }\r
+                               }\r
                        }\r
                        \r
                        ListViewItem item = new ListViewItem(labels);\r

diff --git a/AppliStation/PackageListViewForm.Designer.cs b/AppliStation/PackageListViewForm.Designer.cs
index cb27c0f..8696b2d 100644 (file)
--- a/AppliStation/PackageListViewForm.Designer.cs
+++ b/AppliStation/PackageListViewForm.Designer.cs
@@ -55,6 +55,7 @@
                        this.webResourceCommonContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);\r
                        this.webOfficialMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.webGoogleSearchMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+                       this.webResourceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.installedDirectoryMenuItem = new AppliStation.Util.ToolStripPetitLauncherMenuItem();\r
                        this.propertiesMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.installToolStripButton = new System.Windows.Forms.ToolStripButton();\r
@@ -64,7 +65,6 @@
                        this.packageListContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);\r
                        this.installToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.uninstallToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-                       this.webResourceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.installedDirectoryToolStripMenuItem = new AppliStation.Util.ToolStripPetitLauncherMenuItem();\r
                        this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.viewStyleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -76,6 +76,8 @@
                        this.versionColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.summaryColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.packageListNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+                       this.licenseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+                       this.installDateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.packageListViewImageList = new System.Windows.Forms.ImageList(this.components);\r
                        this.detailBox = new System.Windows.Forms.RichTextBox();\r
                        nameHeader = new System.Windows.Forms.ColumnHeader();\r
@@ -299,7 +301,7 @@
                                                                        this.webOfficialMenuItem,\r
                                                                        this.webGoogleSearchMenuItem});\r
                        this.webResourceCommonContextMenuStrip.Name = "packageListContextMenuStrip";\r
-                       this.webResourceCommonContextMenuStrip.OwnerItem = this.webResourceToolStripMenuItem;\r
+                       this.webResourceCommonContextMenuStrip.OwnerItem = this.webResourceMenuItem;\r
                        this.webResourceCommonContextMenuStrip.Size = new System.Drawing.Size(152, 48);\r
                        this.webResourceCommonContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.WebResourceCommonContextMenuStripOpening);\r
                        // \r
@@ -317,6 +319,14 @@
                        this.webGoogleSearchMenuItem.Text = "Google検索(&G)";\r
                        this.webGoogleSearchMenuItem.Click += new System.EventHandler(this.WebGoogleSearchMenuItemClick);\r
                        // \r
+                       // webResourceToolStripMenuItem\r
+                       // \r
+                       this.webResourceToolStripMenuItem.DropDown = this.webResourceCommonContextMenuStrip;\r
+                       this.webResourceToolStripMenuItem.Name = "webResourceToolStripMenuItem";\r
+                       this.webResourceToolStripMenuItem.Size = new System.Drawing.Size(214, 22);\r
+                       this.webResourceToolStripMenuItem.Tag = "";\r
+                       this.webResourceToolStripMenuItem.Text = "Webページ(&W)";\r
+                       // \r
                        // installedDirectoryMenuItem\r
                        // \r
                        this.installedDirectoryMenuItem.InvokerForm = this;\r
@@ -407,7 +417,7 @@
                                                                        this.viewStyleToolStripMenuItem,\r
                                                                        this.columnToolStripMenuItem});\r
                        this.packageListContextMenuStrip.Name = "packageListContextMenuStrip";\r
-                       this.packageListContextMenuStrip.Size = new System.Drawing.Size(215, 164);\r
+                       this.packageListContextMenuStrip.Size = new System.Drawing.Size(215, 186);\r
                        this.packageListContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.PackageListContextMenuStripOpening);\r
                        // \r
                        // installToolStripMenuItem\r
@@ -424,14 +434,6 @@
                        this.uninstallToolStripMenuItem.Text = "アンインストール(&U)...";\r
                        this.uninstallToolStripMenuItem.Click += new System.EventHandler(this.UninstallToolStripButtonClick);\r
                        // \r
-                       // webResourceToolStripMenuItem\r
-                       // \r
-                       this.webResourceToolStripMenuItem.DropDown = this.webResourceCommonContextMenuStrip;\r
-                       this.webResourceToolStripMenuItem.Name = "webResourceToolStripMenuItem";\r
-                       this.webResourceToolStripMenuItem.Size = new System.Drawing.Size(214, 22);\r
-                       this.webResourceToolStripMenuItem.Tag = "";\r
-                       this.webResourceToolStripMenuItem.Text = "Webページ(&W)";\r
-                       // \r
                        // installedDirectoryToolStripMenuItem\r
                        // \r
                        this.installedDirectoryToolStripMenuItem.InvokerForm = this;\r
@@ -459,14 +461,14 @@
                        // viewStyleListToolStripMenuItem\r
                        // \r
                        this.viewStyleListToolStripMenuItem.Name = "viewStyleListToolStripMenuItem";\r
-                       this.viewStyleListToolStripMenuItem.Size = new System.Drawing.Size(146, 22);\r
+                       this.viewStyleListToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
                        this.viewStyleListToolStripMenuItem.Text = "一覧(&L)";\r
                        this.viewStyleListToolStripMenuItem.Click += new System.EventHandler(this.ViewStyleCommonToolStripMenuItemClick);\r
                        // \r
                        // viewStyleTileToolStripMenuItem\r
                        // \r
                        this.viewStyleTileToolStripMenuItem.Name = "viewStyleTileToolStripMenuItem";\r
-                       this.viewStyleTileToolStripMenuItem.Size = new System.Drawing.Size(146, 22);\r
+                       this.viewStyleTileToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
                        this.viewStyleTileToolStripMenuItem.Text = "並べて表示(&S)";\r
                        this.viewStyleTileToolStripMenuItem.Click += new System.EventHandler(this.ViewStyleCommonToolStripMenuItemClick);\r
                        // \r
@@ -475,7 +477,7 @@
                        this.viewStyleDetailToolStripMenuItem.Checked = true;\r
                        this.viewStyleDetailToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;\r
                        this.viewStyleDetailToolStripMenuItem.Name = "viewStyleDetailToolStripMenuItem";\r
-                       this.viewStyleDetailToolStripMenuItem.Size = new System.Drawing.Size(146, 22);\r
+                       this.viewStyleDetailToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
                        this.viewStyleDetailToolStripMenuItem.Text = "詳細(&D)";\r
                        this.viewStyleDetailToolStripMenuItem.Click += new System.EventHandler(this.ViewStyleCommonToolStripMenuItemClick);\r
                        // \r
@@ -485,7 +487,9 @@
                                                                        this.nameColumnToolStripMenuItem,\r
                                                                        this.versionColumnToolStripMenuItem,\r
                                                                        this.summaryColumnToolStripMenuItem,\r
-                                                                       this.packageListNameToolStripMenuItem});\r
+                                                                       this.packageListNameToolStripMenuItem,\r
+                                                                       this.licenseToolStripMenuItem,\r
+                                                                       this.installDateToolStripMenuItem});\r
                        this.columnToolStripMenuItem.Name = "columnToolStripMenuItem";\r
                        this.columnToolStripMenuItem.Size = new System.Drawing.Size(214, 22);\r
                        this.columnToolStripMenuItem.Text = "列の選択(&S)";\r
@@ -497,7 +501,7 @@
                        this.nameColumnToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;\r
                        this.nameColumnToolStripMenuItem.Enabled = false;\r
                        this.nameColumnToolStripMenuItem.Name = "nameColumnToolStripMenuItem";\r
-                       this.nameColumnToolStripMenuItem.Size = new System.Drawing.Size(158, 22);\r
+                       this.nameColumnToolStripMenuItem.Size = new System.Drawing.Size(161, 22);\r
                        this.nameColumnToolStripMenuItem.Tag = "Name";\r
                        this.nameColumnToolStripMenuItem.Text = "名前";\r
                        this.nameColumnToolStripMenuItem.Click += new System.EventHandler(this.ColumnCommonToolStripMenuItemClick);\r
@@ -508,7 +512,7 @@
                        this.versionColumnToolStripMenuItem.CheckOnClick = true;\r
                        this.versionColumnToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;\r
                        this.versionColumnToolStripMenuItem.Name = "versionColumnToolStripMenuItem";\r
-                       this.versionColumnToolStripMenuItem.Size = new System.Drawing.Size(158, 22);\r
+                       this.versionColumnToolStripMenuItem.Size = new System.Drawing.Size(161, 22);\r
                        this.versionColumnToolStripMenuItem.Tag = "Version";\r
                        this.versionColumnToolStripMenuItem.Text = "バージョン";\r
                        this.versionColumnToolStripMenuItem.Click += new System.EventHandler(this.ColumnCommonToolStripMenuItemClick);\r
@@ -519,7 +523,7 @@
                        this.summaryColumnToolStripMenuItem.CheckOnClick = true;\r
                        this.summaryColumnToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;\r
                        this.summaryColumnToolStripMenuItem.Name = "summaryColumnToolStripMenuItem";\r
-                       this.summaryColumnToolStripMenuItem.Size = new System.Drawing.Size(158, 22);\r
+                       this.summaryColumnToolStripMenuItem.Size = new System.Drawing.Size(161, 22);\r
                        this.summaryColumnToolStripMenuItem.Tag = "Summary";\r
                        this.summaryColumnToolStripMenuItem.Text = "概要";\r
                        this.summaryColumnToolStripMenuItem.Click += new System.EventHandler(this.ColumnCommonToolStripMenuItemClick);\r
@@ -528,11 +532,29 @@
                        // \r
                        this.packageListNameToolStripMenuItem.CheckOnClick = true;\r
                        this.packageListNameToolStripMenuItem.Name = "packageListNameToolStripMenuItem";\r
-                       this.packageListNameToolStripMenuItem.Size = new System.Drawing.Size(158, 22);\r
+                       this.packageListNameToolStripMenuItem.Size = new System.Drawing.Size(161, 22);\r
                        this.packageListNameToolStripMenuItem.Tag = "PackageListName";\r
                        this.packageListNameToolStripMenuItem.Text = "パッケージリスト名";\r
                        this.packageListNameToolStripMenuItem.Click += new System.EventHandler(this.ColumnCommonToolStripMenuItemClick);\r
                        // \r
+                       // licenseToolStripMenuItem\r
+                       // \r
+                       this.licenseToolStripMenuItem.CheckOnClick = true;\r
+                       this.licenseToolStripMenuItem.Name = "licenseToolStripMenuItem";\r
+                       this.licenseToolStripMenuItem.Size = new System.Drawing.Size(161, 22);\r
+                       this.licenseToolStripMenuItem.Tag = "License";\r
+                       this.licenseToolStripMenuItem.Text = "ライセンス";\r
+                       this.licenseToolStripMenuItem.Click += new System.EventHandler(this.ColumnCommonToolStripMenuItemClick);\r
+                       // \r
+                       // installDateToolStripMenuItem\r
+                       // \r
+                       this.installDateToolStripMenuItem.CheckOnClick = true;\r
+                       this.installDateToolStripMenuItem.Name = "installDateToolStripMenuItem";\r
+                       this.installDateToolStripMenuItem.Size = new System.Drawing.Size(161, 22);\r
+                       this.installDateToolStripMenuItem.Tag = "InstallDate";\r
+                       this.installDateToolStripMenuItem.Text = "インストールした日";\r
+                       this.installDateToolStripMenuItem.Click += new System.EventHandler(this.ColumnCommonToolStripMenuItemClick);\r
+                       // \r
                        // packageListViewImageList\r
                        // \r
                        this.packageListViewImageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("packageListViewImageList.ImageStream")));\r
@@ -581,6 +603,8 @@
                        this.packageListContextMenuStrip.ResumeLayout(false);\r
                        this.ResumeLayout(false);\r
                }\r
+               private System.Windows.Forms.ToolStripMenuItem installDateToolStripMenuItem;\r
+               private System.Windows.Forms.ToolStripMenuItem licenseToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripMenuItem packageListNameToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripMenuItem summaryColumnToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripMenuItem versionColumnToolStripMenuItem;\r