X-Git-Url: http://git.sourceforge.jp/view?p=applistation%2FAppliStation.git;a=blobdiff_plain;f=AppliStation%2FPackageInfoForm.cs;h=c2321dd7f8151c3a54418a738d11be7a8d9c8a9d;hp=bba39124e44dd9cad88814608f685e5eec6db9a3;hb=4c883216012d21870b634ef7078cf19deeb0d64b;hpb=d8cd14112019c2acbf439e7c5e86786c69f5340e

diff --git a/AppliStation/PackageInfoForm.cs b/AppliStation/PackageInfoForm.cs
index bba3912..c2321dd 100644
--- a/AppliStation/PackageInfoForm.cs
+++ b/AppliStation/PackageInfoForm.cs
@@ -76,8 +76,8 @@ namespace AppliStation
 				urlLabel.Enabled = false;
 			}
 			tagsTextBox.Text = pkg.Tags;
-			setLinkLabelFromLicense(licenseLinkLabel, pkg.License);
-			typeValueLabel.Text = pkg.Type.ToString();
+			setLinkLabelFromLicense(licenseLinkLabel, pkg.License, pkg.Url.Href);
+			setTypeValueLabel(typeValueLabel, pkg.Type);
 			
 			tabControl1.TabPages.Clear();
 			if (pkg is InstalledPackage && string.IsNullOrEmpty(pkg.Version)) {
@@ -96,26 +96,36 @@ namespace AppliStation
 					tabControl1.TabPages.Add(page);
 				}
 			}
+			
+			this.Size = new Size(this.Size.Width, (tabControl1.TabCount>0)? 380 : 250);
 		}
 		
-		private static void setLinkLabelFromLicense(LinkLabel linklabel, string license)
+		private static void setLinkLabelFromLicense(LinkLabel linklabel, string license, string publicSiteUrl)
 		{
 			linklabel.Enabled = true;
 			switch (license ?? string.Empty) {
 				case "":
-					linklabel.Text = "ƒtƒŠ[ƒ\ƒtƒgƒEƒFƒA (–³ž)";
-					linklabel.Enabled = false;
+					if (string.IsNullOrEmpty(publicSiteUrl)) {
+						linklabel.Text = "ƒtƒŠ[ƒ\ƒtƒgƒEƒFƒA (–³ž)";
+						linklabel.Enabled = false;
+					} else {
+						linklabel.Text = "ƒtƒŠ[ƒ\ƒtƒgƒEƒFƒA (Ú×‚ÍŒöŽ®ƒTƒCƒg‚È‚Ç‚ÅŠm”F‚µ‚Ä‚­‚¾‚³‚¢)";
+						addLinkToLinkLabel(linklabel, "ŒöŽ®ƒTƒCƒg", publicSiteUrl);
+					}
 					break;
+				#region ƒI[ƒvƒ“ƒ\[ƒX‚©‚ƒRƒs[ƒŒƒtƒg
 				case "GPL":
 					linklabel.Text = "GPL (ƒI[ƒvƒ“ƒ\[ƒX)";
 					addLinkToLinkLabel(linklabel, "GPL", @"http://www.gnu.org/licenses/gpl.ja.html");
 					addLinkToLinkLabel(linklabel, "ƒI[ƒvƒ“ƒ\[ƒX", @"http://creativecommons.org/licenses/GPL/2.0/deed.ja");
 					break;
 				case "GPLv2":
+				case "GPLv2+":
 					linklabel.Text = "GPLv2 (ƒI[ƒvƒ“ƒ\[ƒX)";
 					addLinkToLinkLabel(linklabel, "GPLv2", @"http://www.gnu.org/licenses/gpl-2.0.html");
 					break;
 				case "GPLv3":
+				case "GPLv3+":
 					linklabel.Text = "GPLv3 (ƒI[ƒvƒ“ƒ\[ƒX)";
 					addLinkToLinkLabel(linklabel, "GPLv3", @"http://www.gnu.org/licenses/gpl-3.0.html");
 					break;
@@ -125,10 +135,12 @@ namespace AppliStation
 					addLinkToLinkLabel(linklabel, "ƒI[ƒvƒ“ƒ\[ƒX", @"http://creativecommons.org/licenses/LGPL/2.1/deed.ja");
 					break;
 				case "LGPLv2":
+				case "LGPLv2+":
 					linklabel.Text = "LGPLv2 (ƒI[ƒvƒ“ƒ\[ƒX)";
 					addLinkToLinkLabel(linklabel, "LGPLv2", @"http://www.gnu.org/licenses/lgpl-2.1.html");
 					break;
 				case "LGPLv3":
+				case "LGPLv3+":
 					linklabel.Text = "LGPLv3 (ƒI[ƒvƒ“ƒ\[ƒX)";
 					addLinkToLinkLabel(linklabel, "LGPLv3", @"http://www.gnu.org/licenses/lgpl-3.0.html");
 					break;
@@ -140,6 +152,8 @@ namespace AppliStation
 					linklabel.Text = "CPL (ƒI[ƒvƒ“ƒ\[ƒX)";
 					linklabel.Links.Add(0, linklabel.Text.Length, @"http://sourceforge.jp/projects/opensource/wiki/licenses%2FCommon_Public_License");
 					break;
+				#endregion
+				#region ƒI[ƒvƒ“ƒ\[ƒX‚¾‚ªAƒRƒs[ƒŒƒtƒg‚Å‚È‚¢
 				case "MIT":
 					linklabel.Text = "MITƒ‰ƒCƒZƒ“ƒX (ƒI[ƒvƒ“ƒ\[ƒX)";
 					addLinkToLinkLabel(linklabel, "MITƒ‰ƒCƒZƒ“ƒX", @"http://www.opensource.org/licenses/mit-license.php");
@@ -148,12 +162,17 @@ namespace AppliStation
 					linklabel.Text = "C³ÏBSDƒ‰ƒCƒZƒ“ƒX (ƒI[ƒvƒ“ƒ\[ƒX)";
 					addLinkToLinkLabel(linklabel, "BSDƒ‰ƒCƒZƒ“ƒX", @"http://www.opensource.org/licenses/bsd-license.php");
 					break;
+				case "Artistic":
+					linklabel.Text = "Artisticƒ‰ƒCƒZƒ“ƒX (ƒI[ƒvƒ“ƒ\[ƒX)";
+					addLinkToLinkLabel(linklabel, "Artisticƒ‰ƒCƒZƒ“ƒX", @"http://www.perlfoundation.org/artistic_license_2_0");
+					break;
+				#endregion
 				case "NYSL":
 					linklabel.Text = "ŽÏ‚é‚È‚èÄ‚­‚È‚èD‚«‚É‚µ‚냉ƒCƒZƒ“ƒX";
 					linklabel.Links.Add(0, linklabel.Text.Length, @"http://www.kmonos.net/nysl/");
 					break;
 				case "Public Domain":
-					linklabel.Text = "ƒpƒuƒŠƒbƒNƒhƒƒCƒ“ (’˜ìŒ ”ñ“K—p)";
+					linklabel.Text = "ƒpƒuƒŠƒbƒNƒhƒƒCƒ“ (’˜ìŒ ‹A‘®‚È‚µ)";
 					linklabel.Links.Add(0, linklabel.Text.Length, @"http://e-words.jp/w/E38391E38396E383AAE38383E382AFE38389E383A1E382A4E383B3.html");
 					break;
 				default:
@@ -169,6 +188,24 @@ namespace AppliStation
 			
 		}
 		
+		private static void setTypeValueLabel(Label typeValueLabel, InstallerType instType)
+		{
+			switch (instType) {
+				case InstallerType.ARCHIVE:
+					typeValueLabel.Text = "Ž©ŒÈ‰ð“€‘ŒÉ‚Ü‚½‚͏‘ŒÉ";
+					break;
+				case InstallerType.EXEC_INSTALLER:
+					typeValueLabel.Text = "ƒCƒ“ƒXƒg[ƒ‰Œ`Ž®";
+					break;
+				case InstallerType.MSI_PACKAGE:
+					typeValueLabel.Text = "MSIƒtƒ@ƒCƒ‹Œ`Ž®";
+					break;
+				default:
+					typeValueLabel.Text = "•s–¾‚ȃCƒ“ƒXƒg[ƒ‹Œ`Ž®(ƒCƒ“ƒXƒg[ƒ‹•s”\)";
+					break;
+			}
+		}
+		
 		/// <summary>
 		/// ƒŠƒ“ƒNƒ‰ƒxƒ‹‚̃Šƒ“ƒN‘}“ü•Ö—˜ƒƒ\ƒbƒh
 		/// </summary>