uint uninstallPkgCount = 0;\r
bool installBtnEnabled, uninstallBtnEnabled;\r
\r
- Package[] selectedPkgs = NaGet.Utils.IEnumerable2Array<Package>(SelectedPackages<Package>());\r
+ Package[] selectedPkgs = NaGet.Utils.IEnumerable2Array<Package>(GetSelectedPackages<Package>());\r
foreach (Package pkg in selectedPkgs) {\r
if (pkg is InstalledPackage) {\r
uninstallPkgCount ++;\r
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
\r
+ // detailBoxのメッセージ設定\r
+ detailBox.Clear();\r
switch (selectedPkgs.Length) {\r
case 0:\r
- detailBox.SelectionFont = detailBox.Font;\r
int count = packageListView.Items.Count;\r
detailBox.Text = (count > 0) ? string.Format("{0}個のソフトがあります。", count)\r
: "該当するソフトがありません。";\r
ShowInfoToDetailBoxFor(selectedPkgs[0]);\r
break;\r
default: // case 2 and over:\r
- detailBox.SelectionFont = detailBox.Font;\r
detailBox.Text = (installBtnEnabled)? string.Format("{0}個のソフトが選択されています。", installPkgCount) :\r
(uninstallBtnEnabled)? string.Format("{0}個のインストール済みのソフトが選択されています。", uninstallPkgCount) :\r
string.Format("{0}個のソフトが選択されています。\r\n(うち{1}個はインストール済み、{2}個はインストール可能)", installPkgCount+uninstallPkgCount, uninstallPkgCount, installPkgCount);\r
packageListViewImageList.Images.Add("installed", Icon.ExtractAssociatedIcon(Application.ExecutablePath));\r
\r
updatePackageFilterToolStripMenuItemCheckState();\r
+ notInstalledPackageFilterToolStripMenuItem.Image = packageListViewImageList.Images["available-new"];\r
installedASPackageFilterToolStripMenuItem.Image = packageListViewImageList.Images["installed"];\r
installedSysPackageFilterToolStripMenuItem.Image = packageListViewImageList.Images["sys"];\r
}\r
if (currentPackageFilter == PackageFilterIndex.All || currentPackageFilter == PackageFilterIndex.NotInstalled) {\r
foreach (Package pkg in pkgListsMan.AvailablePkgList.Search(searchTextBox.Text)) {\r
if (Installation.GetPreferInstallerIndex(pkg) >= 0) { // インストール可能\r
- if (currentPackageFilter == PackageFilterIndex.NotInstalled &&\r
- (pkgListsMan.InstalledPkgList.GetPackageForName(pkg.Name) != null||\r
- pkgListsMan.SystemInstalledPkgList.GetPackageForName(pkg.Name) != null) ) {\r
+ bool notinstalled = (pkgListsMan.InstalledPkgList.GetPackageForName(pkg.Name) == null&&\r
+ pkgListsMan.SystemInstalledPkgList.GetPackageForName(pkg.Name) == null);\r
+ if (currentPackageFilter == PackageFilterIndex.NotInstalled && ! notinstalled) {\r
continue; // インストール済みは次のループへ(未インストールソフト抽出時)\r
}\r
\r
ListViewItem item = new ListViewItem(new string[]{pkg.Name, pkg.Version, pkg.Summary});\r
item.Tag = pkg;\r
item.ToolTipText = pkg.Summary;\r
+ item.ImageKey = (notinstalled)? "available-new" : "available";\r
\r
this.packageListView.Items.Add(item);\r
}\r
{\r
if (System.Text.RegularExpressions.Regex.IsMatch(e.LinkText, "^https?://")){\r
/* URLの場合はブラウザ起動 */\r
- System.Diagnostics.Process.Start(e.LinkText);\r
+ try {\r
+ System.Diagnostics.Process.Start(e.LinkText);\r
+ } catch (System.ComponentModel.Win32Exception) {\r
+ MessageBox.Show(string.Format("{0}を開くのに失敗しました。", e.LinkText), "ブラウザ起動エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+ }\r
} else {\r
/* それ以外はタグとみなして検索 */\r
searchTextBox.Text = e.LinkText;\r
prog.ShowDialog(this);\r
}\r
\r
- void UpdateToolStripButtonClick(object sender, EventArgs e)\r
+ void UpdateToolStripMenuItemClick(object sender, EventArgs e)\r
{\r
updateActionInvoke(true);\r
\r
UpdatePackageList();\r
}\r
\r
+ void OptionToolStripMenuItemClick(object sender, EventArgs e)\r
+ {\r
+ UserPrefForm userPrefForm = new UserPrefForm();\r
+ DialogResult result = userPrefForm.ShowDialog(this);\r
+ \r
+ if (result == DialogResult.OK) {\r
+ if (userPrefForm.IsRepositoryListSettingChanged) {\r
+ updateActionInvoke(true);\r
+ UpdatePackageList();\r
+ }\r
+ }\r
+ }\r
+ \r
#region searchTextBoxまわり\r
\r
void SearchTextBoxKeyPress(object sender, KeyPressEventArgs e)\r
{\r
InstallationConfirmForm confirm = new InstallationConfirmForm();\r
confirm.PkgListsManager = pkgListsMan;\r
- confirm.Installations = Installation.ConvertInstallations( NaGet.Utils.IEnumerable2Array(SelectedPackages<Package>()) );\r
+ confirm.Installations = Installation.ConvertInstallations( NaGet.Utils.IEnumerable2Array(GetSelectedPackages<Package>()) );\r
confirm.UseRunas = confirm.GetShouldUseRunas();\r
DialogResult result = confirm.ShowDialog(this);\r
\r
hProc.EnableRaisingEvents = true;\r
hProc.SynchronizingObject = this;\r
hProc.Exited += delegate(object sender, EventArgs e) {\r
- pkgListsMan.LoadPackageLists();\r
+ UpdatePackageList();\r
\r
this.setWindowEnabled(true);\r
this.BringToFront();\r
\r
if (File.Exists(tmpfileName)) {\r
File.Delete(tmpfileName);\r
- }\r
- this.setWindowEnabled(true);\r
+ } this.setWindowEnabled(true);\r
}\r
}\r
\r
hProc.EnableRaisingEvents = true;\r
hProc.SynchronizingObject = this;\r
hProc.Exited += delegate(object sender, EventArgs e) {\r
- pkgListsMan.LoadPackageLists();\r
+ UpdatePackageList();\r
\r
this.setWindowEnabled(true);\r
this.BringToFront();\r
void UninstallToolStripButtonClick(object sender, EventArgs e)\r
{\r
PackageUninstallConfirmForm confirm = new PackageUninstallConfirmForm();\r
- foreach (InstalledPackage pkg in SelectedPackages<InstalledPackage>()) {\r
+ foreach (InstalledPackage pkg in GetSelectedPackages<InstalledPackage>()) {\r
confirm.UninstallPackage = pkg;\r
break;\r
}\r
\r
void WebOfficialToolStripMenuItemClick(object sender, EventArgs e)\r
{\r
- foreach (Package pkg in SelectedPackages<Package>()) {\r
+ foreach (Package pkg in GetSelectedPackages<Package>()) {\r
string linkURL = pkg.Url.Href;\r
\r
if (! (pkg == null || string.IsNullOrEmpty(linkURL))) {\r
- System.Diagnostics.Process.Start(linkURL);\r
+ try {\r
+ System.Diagnostics.Process.Start(linkURL);\r
+ } catch (System.ComponentModel.Win32Exception) {\r
+ MessageBox.Show(string.Format("{0}を開くのに失敗しました。", linkURL), "ブラウザ起動エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+ }\r
}\r
break;\r
}\r
\r
void WebGoogleSearchToolStripMenuItemClick(object sender, EventArgs e)\r
{\r
- foreach (Package pkg in SelectedPackages<Package>()) {\r
+ foreach (Package pkg in GetSelectedPackages<Package>()) {\r
string q = System.Web.HttpUtility.UrlEncode(pkg.Name, System.Text.Encoding.UTF8);\r
string googleURL = @"http://www.google.co.jp/search?q="+q;\r
\r
- System.Diagnostics.Process.Start(googleURL);\r
+ try {\r
+ System.Diagnostics.Process.Start(googleURL);\r
+ } catch (System.ComponentModel.Win32Exception) {\r
+ MessageBox.Show("Googleを開くのに失敗しました。", "ブラウザ起動エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+ }\r
\r
break;\r
}\r
\r
void OpenInstalledDirectoryStripMenuItemClick(object sender, EventArgs e)\r
{\r
- foreach (InstalledPackage pkg in SelectedPackages<InstalledPackage>()) {\r
- if (pkg.Type == InstallerType.ARCHIVE) {\r
+ foreach (InstalledPackage pkg in GetSelectedPackages<InstalledPackage>()) {\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
\r
void PropertiesToolStripMenuItemClick(object sender, EventArgs e)\r
{\r
- foreach (Package pkg in SelectedPackages<Package>()) {\r
+ foreach (Package pkg in GetSelectedPackages<Package>()) {\r
PackageInfoForm form = new PackageInfoForm();\r
form.SelectedObject = pkg;\r
form.Text = string.Format("{0}({1})のプロパティ", pkg.Name, pkg.Version);\r
// 選択パッケージが1つのとき\r
bool selectionIsOnlyOne = packageListView.SelectedItems.Count == 1;\r
if (selectionIsOnlyOne) {\r
- Package pkg = SelectedPackage<Package>();\r
+ Package pkg = GetSelectedPackage<Package>();\r
bool isInstalledPackage = pkg is InstalledPackage;\r
\r
webResourcesToolStripMenuItem.Text = string.Format(\r
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
foreach (InstalledPackage pkg in installedPkgList) {\r
Package avaiablePkg = avaiablePkgList.GetPackageForName(pkg.Name);\r
\r
- if (avaiablePkgList != null) {\r
+ if (avaiablePkg != null) {\r
if (verComp.Compare(pkg.Version, avaiablePkg.Version) < 0 &&\r
installedPkgList.GetPackageForPackage(pkg.Name, avaiablePkg.Version) == null) {\r
\r
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
}\r
}\r
\r
+ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)\r
+ {\r
+ if ((int)keyData == (int)Keys.Control + (int)Keys.E) {\r
+ searchTextBox.SelectAll();\r
+ searchTextBox.Focus();\r
+ return true;\r
+ }\r
+ \r
+ return base.ProcessCmdKey(ref msg, keyData);\r
+ }\r
+ \r
public void UpdatePackageList()\r
{\r
pkgListsMan.LoadPackageLists();\r
/// <summary>\r
/// インストールするよう選択されたパッケージの配列\r
/// </summary>\r
- public IEnumerable<TPackage> SelectedPackages<TPackage>() where TPackage : Package\r
+ public IEnumerable<TPackage> GetSelectedPackages<TPackage>() where TPackage : Package\r
{\r
- List<TPackage> pkgs = new List<TPackage>();\r
foreach (ListViewItem item in packageListView.SelectedItems) {\r
- pkgs.Add((TPackage) item.Tag);\r
+ yield return (TPackage) item.Tag;\r
}\r
- \r
- return pkgs;\r
}\r
\r
/// <summary>\r
/// インストールするよう選択されたパッケージをひとつ返す。\r
/// </summary>\r
/// <returns>選択されたパッケージ(選択されていないときはnull)</returns>\r
- public TPackage SelectedPackage<TPackage>() where TPackage : Package\r
+ public TPackage GetSelectedPackage<TPackage>() where TPackage : Package\r
{\r
foreach (ListViewItem item in packageListView.SelectedItems) {\r
return (TPackage) item.Tag;\r