na-get-lib,パフォーマンスチューニングなど（動作変更なし）

[applistation/AppliStation.git] / AppliStation / PackageListViewForm.cs

diff --git a/AppliStation/PackageListViewForm.cs b/AppliStation/PackageListViewForm.cs
index 872b136..3c3263d 100644 (file)
--- a/AppliStation/PackageListViewForm.cs
+++ b/AppliStation/PackageListViewForm.cs
@@ -89,7 +89,6 @@ namespace AppliStation
                        installBtnEnabled = (installPkgCount > 0) && (uninstallPkgCount == 0);\r
                        uninstallBtnEnabled = (uninstallPkgCount == 1) && (installPkgCount == 0);\r
                        \r
-                       upgradeToolStripButton.Visible = (selectedPkgs.Length <= 0);\r
                        informationToolStripDropDownButton.Visible = (selectedPkgs.Length == 1);\r
                        uninstallToolStripButton.Visible = uninstallBtnEnabled;\r
                        installToolStripButton.Visible = installBtnEnabled;\r
@@ -566,7 +565,7 @@ namespace AppliStation
                void OpenInstalledDirectoryStripMenuItemClick(object sender, EventArgs e)\r
                {\r
                        foreach (InstalledPackage pkg in GetSelectedPackages<InstalledPackage>()) {\r
-                               if (pkg.Type == InstallerType.ARCHIVE) {\r
+                               if (pkg.Type == InstallerType.ARCHIVE || pkg.Type == InstallerType.ITSELF) {\r
                                        System.Diagnostics.Process.Start(Path.Combine(NaGet.Env.ArchiveProgramFiles, pkg.Name));\r
                                } else if (Directory.Exists(pkg.discoverInstalledLocation())) {\r
                                        System.Diagnostics.Process.Start(pkg.discoverInstalledLocation());\r
@@ -616,11 +615,16 @@ namespace AppliStation
                                webOfficialToolStripMenuItem.Enabled = ! (pkg.Url == null || string.IsNullOrEmpty(pkg.Url.Href));\r
                                // webGoogleSearchToolStripMenuItem always active.\r
                                \r
-                               bool installedDirectoryStripMenuItemVisible = isInstalledPackage &&\r
-                                       ( (pkg.Type == InstallerType.ARCHIVE) || Directory.Exists(((InstalledPackage) pkg).discoverInstalledLocation()) );\r
-                               installedDirectoryStripMenuItem.Visible = installedDirectoryStripMenuItemVisible;\r
-                               if (installedDirectoryStripMenuItemVisible) {\r
-                                       buildInstalledDirectoryMenuItemStripChildren((InstalledPackage) pkg);\r
+                               if (isInstalledPackage) {\r
+                                       bool installedDirectoryStripMenuItemVisible = \r
+                                               (pkg.Type == InstallerType.ARCHIVE) ||\r
+                                               (pkg.Type == InstallerType.ITSELF) ||\r
+                                               Directory.Exists(((InstalledPackage) pkg).discoverInstalledLocation());\r
+                                       \r
+                                       installedDirectoryStripMenuItem.Visible = installedDirectoryStripMenuItemVisible;\r
+                                       if (installedDirectoryStripMenuItemVisible) {\r
+                                               buildInstalledDirectoryMenuItemStripChildren((InstalledPackage) pkg);\r
+                                       }\r
                                }\r
                        }\r
                        \r
@@ -651,7 +655,7 @@ namespace AppliStation
                        VersionComparetor verComp = new VersionComparetor();\r
                        PackageList<Package> avaiablePackageList = pkgListsMan.AvailablePkgList;\r
                        \r
-                       pkgs = NaGet.Utils.MeargeList(\r
+                       pkgs = NaGet.Utils.MergeList(\r
                                getUpdatedPackages(pkgListsMan.InstalledPkgList, avaiablePackageList, verComp),\r
                                getUpdatedPackages(pkgListsMan.SystemInstalledPkgList, avaiablePackageList, verComp)\r
                        );\r