{\r
AppliStation.Util.ExecutionProgressViewer prog = new AppliStation.Util.ExecutionProgressViewer();\r
prog.Shown += delegate(object sender2, EventArgs e2) {\r
- NaGet.SubCommands.NaGetUpdate tasks = new NaGet.SubCommands.NaGetUpdate(pkgListsMan, downloadPackageListsFlag);\r
+ NaGet.SubCommands.NaGetUpdate2 tasks = new NaGet.SubCommands.NaGetUpdate2(pkgListsMan, downloadPackageListsFlag);\r
prog.SetTaskSet(tasks);\r
prog.Refresh();\r
prog.StartTaskSet();\r
void SoftCollectionFileExportToolStripMenuItemClick(object sender, EventArgs e)\r
{\r
string pwd = Directory.GetCurrentDirectory();\r
- string[] softtargets = new string[]{"PCにインストールされたソフト", "AppliStation内でインストールされたソフト", "インストールされたソフトすべて"};\r
+ string[] softtargets = new string[]{\r
+ "PCにインストールされたソフト",\r
+ "AppliStation内でインストールされたソフト",\r
+ "インストールされたソフトすべて;PCとAppliStationにインストールされたソフトの両方"\r
+ };\r
int softtargetid = softtargets.Length - 1;\r
\r
{\r
- AppliStation.Util.OptionDialog optdialog = AppliStation.Util.OptionDialog.createOptionDialog(\r
+ AppliStation.Util.OptionDialog optdialog = AppliStation.Util.OptionDialog.createCommandSelectionDialog(\r
"ソフトコレクションファイルに出力するソフトの種類を選択してください。", "エクスポート", "エクスポートするソフト",\r
- System.Drawing.SystemIcons.Question, MessageBoxButtons.OKCancel,\r
+ System.Drawing.SystemIcons.Question,\r
softtargets, softtargets.Length-1);\r
if (optdialog.ShowDialog(this) != DialogResult.OK) {\r
return; // canceled\r
{\r
AppliStation.Util.ExecutionProgressViewer prog = new AppliStation.Util.ExecutionProgressViewer();\r
prog.Shown += delegate(object sender2, EventArgs e2) {\r
- NaGet.SubCommands.NaGetInstall tasks = new NaGet.SubCommands.NaGetInstall(pkgListsMan, insts);\r
+ NaGet.SubCommands.NaGetInstall2 tasks = new NaGet.SubCommands.NaGetInstall2(pkgListsMan, insts);\r
prog.SetTaskSet(tasks);\r
prog.Refresh();\r
prog.StartTaskSet();\r
{\r
AppliStation.Util.ExecutionProgressViewer prog = new AppliStation.Util.ExecutionProgressViewer();\r
prog.Shown += delegate(object sender2, EventArgs e2) {\r
- NaGet.SubCommands.NaGetUninstall tasks = new NaGet.SubCommands.NaGetUninstall(pkgListsMan, pkgs);\r
+ NaGet.SubCommands.NaGetUninstall2 tasks = new NaGet.SubCommands.NaGetUninstall2(pkgListsMan, pkgs);\r
prog.SetTaskSet(tasks);\r
prog.Refresh();\r
prog.StartTaskSet();\r
{\r
AppliStation.Util.ExecutionProgressViewer prog = new AppliStation.Util.ExecutionProgressViewer();\r
prog.Shown += delegate(object sender2, EventArgs e2) {\r
- NaGet.SubCommands.NaGetDownloadToCache tasks = new NaGet.SubCommands.NaGetDownloadToCache(pkgListsMan, pkgs);\r
+ NaGet.SubCommands.NaGetDownloadToCache2 tasks = new NaGet.SubCommands.NaGetDownloadToCache2(pkgListsMan, pkgs);\r
prog.SetTaskSet(tasks);\r
prog.Refresh();\r
prog.StartTaskSet();\r
int headerHeight = AppliStation.Util.NativeMethods.ColumnHeader_GetSize(packageListView).Height;\r
if (packageListView.PointToClient(packageListContextMenuStrip.Location).Y < headerHeight) {\r
selectionIsOnlyOne = hasSelection = false;\r
- installToolStripMenuItem.Visible = false;\r
uninstallToolStripMenuItem.Visible = false;\r
+ installToolStripMenuItem.Visible = false;\r
+ downloadToolStripMenuItem.Visible = false;\r
installedDirectoryToolStripMenuItem.Visible = false;\r
}\r
}\r
// webGoogleSearchMenuItem always active.\r
}\r
\r
- private IEnumerable<Package> getUpdatedPackages(PackageList<InstalledPackage> installedPkgList, PackageList<Package> avaiablePkgList, IComparer<string> verComp)\r
- {\r
- foreach (InstalledPackage pkg in installedPkgList) {\r
- Package avaiablePkg = avaiablePkgList.GetPackageForName(pkg.Name);\r
- \r
- if (avaiablePkg != null) {\r
- if (verComp.Compare(pkg.Version, avaiablePkg.Version) < 0 &&\r
- installedPkgList.GetPackageForPackage(pkg.Name, avaiablePkg.Version) == null) {\r
- \r
- yield return avaiablePkg;\r
- }\r
- }\r
- }\r
- }\r
- \r
void UpgradeToolStripButtonClick(object sender, EventArgs e)\r
{\r
- List<Package> pkgs;\r
- VersionComparetor verComp = new VersionComparetor();\r
- PackageList<Package> avaiablePackageList = pkgListsMan.AvailablePkgList;\r
- \r
- pkgs = NaGet.Utils.MergeList(\r
- getUpdatedPackages(pkgListsMan.InstalledPkgList, avaiablePackageList, verComp),\r
- getUpdatedPackages(pkgListsMan.SystemInstalledPkgList, avaiablePackageList, verComp)\r
+ List<Package> pkgs = new List<Package>(\r
+ UpgradeFinder.GetUpgradePackages(pkgListsMan)\r
);\r
\r
if (pkgs.Count <= 0) {\r