AppliStation-GUI,リストビューのコンテキストメニューが「情報」ボタンの近くで開いてしまう問題を修正

diff --git a/AppliStation/PackageListViewForm.Designer.cs b/AppliStation/PackageListViewForm.Designer.cs
index f5735d8..942d368 100644 (file)
--- a/AppliStation/PackageListViewForm.Designer.cs
+++ b/AppliStation/PackageListViewForm.Designer.cs
@@ -48,14 +48,12 @@
                        this.optionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.upgradeToolStripButton = new System.Windows.Forms.ToolStripButton();\r
                        this.informationToolStripDropDownButton = new System.Windows.Forms.ToolStripDropDownButton();\r
-                       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.webResourcesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-                       this.webOfficialToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-                       this.webGoogleSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-                       this.installedDirectoryStripMenuItem = new AppliStation.Util.ToolStripPetitLauncherMenuItem();\r
-                       this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+                       this.webResourceMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+                       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.installedDirectoryMenuItem = new AppliStation.Util.ToolStripPetitLauncherMenuItem();\r
+                       this.propertiesMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.installToolStripButton = new System.Windows.Forms.ToolStripButton();\r
                        this.uninstallToolStripButton = new System.Windows.Forms.ToolStripButton();\r
                        this.splitContainer = new System.Windows.Forms.SplitContainer();\r
@@ -63,22 +61,29 @@
                        this.nameHeader = new System.Windows.Forms.ColumnHeader();\r
                        this.versionHeader = new System.Windows.Forms.ColumnHeader();\r
                        this.summaryHeader = new System.Windows.Forms.ColumnHeader();\r
+                       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.packageListViewImageList = new System.Windows.Forms.ImageList(this.components);\r
                        this.detailBox = new System.Windows.Forms.RichTextBox();\r
                        this.tableLayoutPanel1.SuspendLayout();\r
                        this.toolStripContainer.SuspendLayout();\r
                        this.packageListFilterToolStrip.SuspendLayout();\r
                        this.packageCommandsToolStrip.SuspendLayout();\r
-                       this.packageListContextMenuStrip.SuspendLayout();\r
+                       this.webResourceCommonContextMenuStrip.SuspendLayout();\r
                        this.splitContainer.Panel1.SuspendLayout();\r
                        this.splitContainer.Panel2.SuspendLayout();\r
                        this.splitContainer.SuspendLayout();\r
+                       this.packageListContextMenuStrip.SuspendLayout();\r
                        this.SuspendLayout();\r
                        // \r
                        // packageListContextMenuStripSeparator\r
                        // \r
                        this.packageListContextMenuStripSeparator.Name = "packageListContextMenuStripSeparator";\r
-                       this.packageListContextMenuStripSeparator.Size = new System.Drawing.Size(236, 6);\r
+                       this.packageListContextMenuStripSeparator.Size = new System.Drawing.Size(211, 6);\r
                        // \r
                        // tableLayoutPanel1\r
                        // \r
@@ -114,7 +119,7 @@
                                                                        this.searchTextBox});\r
                        this.packageListFilterToolStrip.Location = new System.Drawing.Point(3, 0);\r
                        this.packageListFilterToolStrip.Name = "packageListFilterToolStrip";\r
-                       this.packageListFilterToolStrip.Size = new System.Drawing.Size(177, 25);\r
+                       this.packageListFilterToolStrip.Size = new System.Drawing.Size(175, 25);\r
                        this.packageListFilterToolStrip.TabIndex = 1;\r
                        // \r
                        // packageFilterToolStripDropDownButton\r
@@ -130,7 +135,7 @@
                        // allPackageFilterToolStripMenuItem\r
                        // \r
                        this.allPackageFilterToolStripMenuItem.Name = "allPackageFilterToolStripMenuItem";\r
-                       this.allPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(160, 22);\r
+                       this.allPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(150, 22);\r
                        this.allPackageFilterToolStripMenuItem.Text = "全て";\r
                        this.allPackageFilterToolStripMenuItem.ToolTipText = "全てのソフトを表示";\r
                        this.allPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
@@ -138,7 +143,7 @@
                        // notInstalledPackageFilterToolStripMenuItem\r
                        // \r
                        this.notInstalledPackageFilterToolStripMenuItem.Name = "notInstalledPackageFilterToolStripMenuItem";\r
-                       this.notInstalledPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(160, 22);\r
+                       this.notInstalledPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(150, 22);\r
                        this.notInstalledPackageFilterToolStripMenuItem.Text = "未インストール";\r
                        this.notInstalledPackageFilterToolStripMenuItem.ToolTipText = "インストールされていないソフトを表示";\r
                        this.notInstalledPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
@@ -146,7 +151,7 @@
                        // installedASPackageFilterToolStripMenuItem\r
                        // \r
                        this.installedASPackageFilterToolStripMenuItem.Name = "installedASPackageFilterToolStripMenuItem";\r
-                       this.installedASPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(160, 22);\r
+                       this.installedASPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(150, 22);\r
                        this.installedASPackageFilterToolStripMenuItem.Text = "AppliStation内";\r
                        this.installedASPackageFilterToolStripMenuItem.ToolTipText = "AppliStationにインストールされているソフトを表示";\r
                        this.installedASPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
@@ -154,7 +159,7 @@
                        // installedSysPackageFilterToolStripMenuItem\r
                        // \r
                        this.installedSysPackageFilterToolStripMenuItem.Name = "installedSysPackageFilterToolStripMenuItem";\r
-                       this.installedSysPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(160, 22);\r
+                       this.installedSysPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(150, 22);\r
                        this.installedSysPackageFilterToolStripMenuItem.Text = "コンピュータ内";\r
                        this.installedSysPackageFilterToolStripMenuItem.ToolTipText = "コンピュータにインストールされているソフトを表示";\r
                        this.installedSysPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
@@ -181,7 +186,7 @@
                                                                        this.uninstallToolStripButton});\r
                        this.packageCommandsToolStrip.Location = new System.Drawing.Point(3, 25);\r
                        this.packageCommandsToolStrip.Name = "packageCommandsToolStrip";\r
-                       this.packageCommandsToolStrip.Size = new System.Drawing.Size(489, 25);\r
+                       this.packageCommandsToolStrip.Size = new System.Drawing.Size(184, 25);\r
                        this.packageCommandsToolStrip.TabIndex = 2;\r
                        // \r
                        // organizeToolStripDropDownButton1\r
@@ -194,7 +199,7 @@
                        this.organizeToolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("organizeToolStripDropDownButton1.Image")));\r
                        this.organizeToolStripDropDownButton1.Name = "organizeToolStripDropDownButton1";\r
                        this.organizeToolStripDropDownButton1.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;\r
-                       this.organizeToolStripDropDownButton1.Size = new System.Drawing.Size(80, 22);\r
+                       this.organizeToolStripDropDownButton1.Size = new System.Drawing.Size(74, 22);\r
                        this.organizeToolStripDropDownButton1.Text = "整理(&O)";\r
                        this.organizeToolStripDropDownButton1.ToolTipText = "ソフトリストの管理など";\r
                        // \r
@@ -203,7 +208,7 @@
                        this.updateToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("updateToolStripMenuItem.Image")));\r
                        this.updateToolStripMenuItem.Name = "updateToolStripMenuItem";\r
                        this.updateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F5)));\r
-                       this.updateToolStripMenuItem.Size = new System.Drawing.Size(296, 22);\r
+                       this.updateToolStripMenuItem.Size = new System.Drawing.Size(256, 22);\r
                        this.updateToolStripMenuItem.Text = "リストの更新(&U)";\r
                        this.updateToolStripMenuItem.ToolTipText = "ソフトリストを更新します";\r
                        this.updateToolStripMenuItem.Click += new System.EventHandler(this.UpdateToolStripMenuItemClick);\r
@@ -212,19 +217,19 @@
                        // \r
                        this.localupdateToolStripMenuItem.Name = "localupdateToolStripMenuItem";\r
                        this.localupdateToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5;\r
-                       this.localupdateToolStripMenuItem.Size = new System.Drawing.Size(296, 22);\r
+                       this.localupdateToolStripMenuItem.Size = new System.Drawing.Size(256, 22);\r
                        this.localupdateToolStripMenuItem.Text = "インストール済ソフトの読み直し(&R)";\r
                        this.localupdateToolStripMenuItem.Click += new System.EventHandler(this.LocalupdateToolStripMenuItemClick);\r
                        // \r
                        // organizeToolStripSeparator1\r
                        // \r
                        this.organizeToolStripSeparator1.Name = "organizeToolStripSeparator1";\r
-                       this.organizeToolStripSeparator1.Size = new System.Drawing.Size(293, 6);\r
+                       this.organizeToolStripSeparator1.Size = new System.Drawing.Size(253, 6);\r
                        // \r
                        // optionToolStripMenuItem\r
                        // \r
                        this.optionToolStripMenuItem.Name = "optionToolStripMenuItem";\r
-                       this.optionToolStripMenuItem.Size = new System.Drawing.Size(296, 22);\r
+                       this.optionToolStripMenuItem.Size = new System.Drawing.Size(256, 22);\r
                        this.optionToolStripMenuItem.Text = "設定(&O)...";\r
                        this.optionToolStripMenuItem.Click += new System.EventHandler(this.OptionToolStripMenuItemClick);\r
                        // \r
@@ -232,92 +237,76 @@
                        // \r
                        this.upgradeToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("upgradeToolStripButton.Image")));\r
                        this.upgradeToolStripButton.Name = "upgradeToolStripButton";\r
-                       this.upgradeToolStripButton.Size = new System.Drawing.Size(119, 22);\r
+                       this.upgradeToolStripButton.Size = new System.Drawing.Size(100, 22);\r
                        this.upgradeToolStripButton.Text = "ソフトの更新(&G)";\r
                        this.upgradeToolStripButton.ToolTipText = "最新版のソフトを取得して更新します";\r
                        this.upgradeToolStripButton.Click += new System.EventHandler(this.UpgradeToolStripButtonClick);\r
                        // \r
                        // informationToolStripDropDownButton\r
                        // \r
-                       this.informationToolStripDropDownButton.DropDown = this.packageListContextMenuStrip;\r
+                       this.informationToolStripDropDownButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+                                                                       this.webResourceMenuItem,\r
+                                                                       this.installedDirectoryMenuItem,\r
+                                                                       this.propertiesMenuItem});\r
                        this.informationToolStripDropDownButton.Image = ((System.Drawing.Image)(resources.GetObject("informationToolStripDropDownButton.Image")));\r
                        this.informationToolStripDropDownButton.Name = "informationToolStripDropDownButton";\r
-                       this.informationToolStripDropDownButton.Size = new System.Drawing.Size(80, 22);\r
+                       this.informationToolStripDropDownButton.Size = new System.Drawing.Size(74, 22);\r
                        this.informationToolStripDropDownButton.Text = "情報(&D)";\r
                        this.informationToolStripDropDownButton.ToolTipText = "選択されたソフトの情報を調べます";\r
                        this.informationToolStripDropDownButton.Visible = false;\r
+                       this.informationToolStripDropDownButton.DropDownOpening += new System.EventHandler(this.InformationToolStripDropDownButtonDropDownOpening);\r
                        // \r
-                       // packageListContextMenuStrip\r
+                       // webResourceMenuItem\r
                        // \r
-                       this.packageListContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-                                                                       this.installToolStripMenuItem,\r
-                                                                       this.uninstallToolStripMenuItem,\r
-                                                                       this.packageListContextMenuStripSeparator,\r
-                                                                       this.webResourcesToolStripMenuItem,\r
-                                                                       this.installedDirectoryStripMenuItem,\r
-                                                                       this.propertiesToolStripMenuItem});\r
-                       this.packageListContextMenuStrip.Name = "packageListContextMenuStrip";\r
-                       this.packageListContextMenuStrip.OwnerItem = this.informationToolStripDropDownButton;\r
-                       this.packageListContextMenuStrip.Size = new System.Drawing.Size(240, 120);\r
-                       this.packageListContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.PackageListContextMenuStripOpening);\r
-                       // \r
-                       // installToolStripMenuItem\r
-                       // \r
-                       this.installToolStripMenuItem.Name = "installToolStripMenuItem";\r
-                       this.installToolStripMenuItem.Size = new System.Drawing.Size(239, 22);\r
-                       this.installToolStripMenuItem.Text = "インストール(&I)...";\r
-                       this.installToolStripMenuItem.Click += new System.EventHandler(this.InstallToolStripButtonClick);\r
-                       // \r
-                       // uninstallToolStripMenuItem\r
-                       // \r
-                       this.uninstallToolStripMenuItem.Name = "uninstallToolStripMenuItem";\r
-                       this.uninstallToolStripMenuItem.Size = new System.Drawing.Size(239, 22);\r
-                       this.uninstallToolStripMenuItem.Text = "アンインストール(&U)...";\r
-                       this.uninstallToolStripMenuItem.Click += new System.EventHandler(this.UninstallToolStripButtonClick);\r
+                       this.webResourceMenuItem.DropDown = this.webResourceCommonContextMenuStrip;\r
+                       this.webResourceMenuItem.Name = "webResourceMenuItem";\r
+                       this.webResourceMenuItem.Size = new System.Drawing.Size(214, 22);\r
+                       this.webResourceMenuItem.Tag = "";\r
+                       this.webResourceMenuItem.Text = "Webページ(&W)";\r
                        // \r
-                       // webResourcesToolStripMenuItem\r
+                       // webResourceCommonContextMenuStrip\r
                        // \r
-                       this.webResourcesToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-                                                                       this.webOfficialToolStripMenuItem,\r
-                                                                       this.webGoogleSearchToolStripMenuItem});\r
-                       this.webResourcesToolStripMenuItem.Name = "webResourcesToolStripMenuItem";\r
-                       this.webResourcesToolStripMenuItem.Size = new System.Drawing.Size(239, 22);\r
-                       this.webResourcesToolStripMenuItem.Tag = "\"{0}\"に関するWebページ(&W)";\r
+                       this.webResourceCommonContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+                                                                       this.webOfficialMenuItem,\r
+                                                                       this.webGoogleSearchMenuItem});\r
+                       this.webResourceCommonContextMenuStrip.Name = "packageListContextMenuStrip";\r
+                       this.webResourceCommonContextMenuStrip.Size = new System.Drawing.Size(152, 48);\r
+                       this.webResourceCommonContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.WebResourceCommonContextMenuStripOpening);\r
                        // \r
-                       // webOfficialToolStripMenuItem\r
+                       // webOfficialMenuItem\r
                        // \r
-                       this.webOfficialToolStripMenuItem.Name = "webOfficialToolStripMenuItem";\r
-                       this.webOfficialToolStripMenuItem.Size = new System.Drawing.Size(159, 22);\r
-                       this.webOfficialToolStripMenuItem.Text = "公式サイト(&O)";\r
-                       this.webOfficialToolStripMenuItem.Click += new System.EventHandler(this.WebOfficialToolStripMenuItemClick);\r
+                       this.webOfficialMenuItem.Name = "webOfficialMenuItem";\r
+                       this.webOfficialMenuItem.Size = new System.Drawing.Size(151, 22);\r
+                       this.webOfficialMenuItem.Text = "公式サイト(&O)";\r
+                       this.webOfficialMenuItem.Click += new System.EventHandler(this.WebOfficialMenuItemClick);\r
                        // \r
-                       // webGoogleSearchToolStripMenuItem\r
+                       // webGoogleSearchMenuItem\r
                        // \r
-                       this.webGoogleSearchToolStripMenuItem.Name = "webGoogleSearchToolStripMenuItem";\r
-                       this.webGoogleSearchToolStripMenuItem.Size = new System.Drawing.Size(159, 22);\r
-                       this.webGoogleSearchToolStripMenuItem.Text = "Google検索(&G)";\r
-                       this.webGoogleSearchToolStripMenuItem.Click += new System.EventHandler(this.WebGoogleSearchToolStripMenuItemClick);\r
+                       this.webGoogleSearchMenuItem.Name = "webGoogleSearchMenuItem";\r
+                       this.webGoogleSearchMenuItem.Size = new System.Drawing.Size(151, 22);\r
+                       this.webGoogleSearchMenuItem.Text = "Google検索(&G)";\r
+                       this.webGoogleSearchMenuItem.Click += new System.EventHandler(this.WebGoogleSearchMenuItemClick);\r
                        // \r
-                       // installedDirectoryStripMenuItem\r
+                       // installedDirectoryMenuItem\r
                        // \r
-                       this.installedDirectoryStripMenuItem.InvokerForm = this;\r
-                       this.installedDirectoryStripMenuItem.Name = "installedDirectoryStripMenuItem";\r
-                       this.installedDirectoryStripMenuItem.Size = new System.Drawing.Size(239, 22);\r
-                       this.installedDirectoryStripMenuItem.Text = "インストール先のフォルダー(&O)";\r
+                       this.installedDirectoryMenuItem.InvokerForm = this;\r
+                       this.installedDirectoryMenuItem.Name = "installedDirectoryMenuItem";\r
+                       this.installedDirectoryMenuItem.Size = new System.Drawing.Size(214, 22);\r
+                       this.installedDirectoryMenuItem.Text = "インストール先のフォルダー(&O)";\r
                        // \r
-                       // propertiesToolStripMenuItem\r
+                       // propertiesMenuItem\r
                        // \r
-                       this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";\r
-                       this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(239, 22);\r
-                       this.propertiesToolStripMenuItem.Text = "プロパティ(&R)";\r
-                       this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesToolStripMenuItemClick);\r
+                       this.propertiesMenuItem.Name = "propertiesMenuItem";\r
+                       this.propertiesMenuItem.Size = new System.Drawing.Size(214, 22);\r
+                       this.propertiesMenuItem.Text = "プロパティ(&R)";\r
+                       this.propertiesMenuItem.Click += new System.EventHandler(this.PropertiesCommonMenuItemClick);\r
                        // \r
                        // installToolStripButton\r
                        // \r
                        this.installToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("installToolStripButton.Image")));\r
                        this.installToolStripButton.Name = "installToolStripButton";\r
                        this.installToolStripButton.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;\r
-                       this.installToolStripButton.Size = new System.Drawing.Size(115, 22);\r
+                       this.installToolStripButton.Size = new System.Drawing.Size(91, 22);\r
                        this.installToolStripButton.Text = "インストール(&I)";\r
                        this.installToolStripButton.ToolTipText = "選択されているソフトをインストールします";\r
                        this.installToolStripButton.Visible = false;\r
@@ -328,7 +317,7 @@
                        this.uninstallToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("uninstallToolStripButton.Image")));\r
                        this.uninstallToolStripButton.Name = "uninstallToolStripButton";\r
                        this.uninstallToolStripButton.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;\r
-                       this.uninstallToolStripButton.Size = new System.Drawing.Size(143, 22);\r
+                       this.uninstallToolStripButton.Size = new System.Drawing.Size(114, 22);\r
                        this.uninstallToolStripButton.Text = "アンインストール(&U)";\r
                        this.uninstallToolStripButton.ToolTipText = "選択されているソフトをアンインストールします";\r
                        this.uninstallToolStripButton.Visible = false;\r
@@ -389,6 +378,55 @@
                        this.summaryHeader.Text = "概要";\r
                        this.summaryHeader.Width = 300;\r
                        // \r
+                       // packageListContextMenuStrip\r
+                       // \r
+                       this.packageListContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+                                                                       this.installToolStripMenuItem,\r
+                                                                       this.uninstallToolStripMenuItem,\r
+                                                                       this.packageListContextMenuStripSeparator,\r
+                                                                       this.webResourceToolStripMenuItem,\r
+                                                                       this.installedDirectoryToolStripMenuItem,\r
+                                                                       this.propertiesToolStripMenuItem});\r
+                       this.packageListContextMenuStrip.Name = "packageListContextMenuStrip";\r
+                       this.packageListContextMenuStrip.Size = new System.Drawing.Size(215, 120);\r
+                       this.packageListContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.PackageListContextMenuStripOpening);\r
+                       // \r
+                       // installToolStripMenuItem\r
+                       // \r
+                       this.installToolStripMenuItem.Name = "installToolStripMenuItem";\r
+                       this.installToolStripMenuItem.Size = new System.Drawing.Size(214, 22);\r
+                       this.installToolStripMenuItem.Text = "インストール(&I)...";\r
+                       this.installToolStripMenuItem.Click += new System.EventHandler(this.InstallToolStripButtonClick);\r
+                       // \r
+                       // uninstallToolStripMenuItem\r
+                       // \r
+                       this.uninstallToolStripMenuItem.Name = "uninstallToolStripMenuItem";\r
+                       this.uninstallToolStripMenuItem.Size = new System.Drawing.Size(214, 22);\r
+                       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
+                       this.installedDirectoryToolStripMenuItem.Name = "installedDirectoryToolStripMenuItem";\r
+                       this.installedDirectoryToolStripMenuItem.Size = new System.Drawing.Size(214, 22);\r
+                       this.installedDirectoryToolStripMenuItem.Text = "インストール先のフォルダー(&O)";\r
+                       // \r
+                       // propertiesToolStripMenuItem\r
+                       // \r
+                       this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";\r
+                       this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(214, 22);\r
+                       this.propertiesToolStripMenuItem.Text = "プロパティ(&R)";\r
+                       this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesCommonMenuItemClick);\r
+                       // \r
                        // packageListViewImageList\r
                        // \r
                        this.packageListViewImageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("packageListViewImageList.ImageStream")));\r
@@ -430,12 +468,21 @@
                        this.packageListFilterToolStrip.PerformLayout();\r
                        this.packageCommandsToolStrip.ResumeLayout(false);\r
                        this.packageCommandsToolStrip.PerformLayout();\r
-                       this.packageListContextMenuStrip.ResumeLayout(false);\r
+                       this.webResourceCommonContextMenuStrip.ResumeLayout(false);\r
                        this.splitContainer.Panel1.ResumeLayout(false);\r
                        this.splitContainer.Panel2.ResumeLayout(false);\r
                        this.splitContainer.ResumeLayout(false);\r
+                       this.packageListContextMenuStrip.ResumeLayout(false);\r
                        this.ResumeLayout(false);\r
                }\r
+               private System.Windows.Forms.ToolStripMenuItem webResourceToolStripMenuItem;\r
+               private System.Windows.Forms.ToolStripMenuItem propertiesMenuItem;\r
+               private AppliStation.Util.ToolStripPetitLauncherMenuItem installedDirectoryMenuItem;\r
+               private System.Windows.Forms.ToolStripMenuItem webResourceMenuItem;\r
+               private AppliStation.Util.ToolStripPetitLauncherMenuItem installedDirectoryToolStripMenuItem;\r
+               private System.Windows.Forms.ToolStripMenuItem webGoogleSearchMenuItem;\r
+               private System.Windows.Forms.ToolStripMenuItem webOfficialMenuItem;\r
+               private System.Windows.Forms.ContextMenuStrip webResourceCommonContextMenuStrip;\r
                private System.Windows.Forms.ToolStripMenuItem optionToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripSeparator organizeToolStripSeparator1;\r
                private System.Windows.Forms.ToolStripMenuItem localupdateToolStripMenuItem;\r
@@ -444,11 +491,7 @@
                private System.Windows.Forms.ImageList packageListViewImageList;\r
                private System.Windows.Forms.ToolStripDropDownButton informationToolStripDropDownButton;\r
                private System.Windows.Forms.ToolStripSeparator packageListContextMenuStripSeparator;\r
-               private AppliStation.Util.ToolStripPetitLauncherMenuItem installedDirectoryStripMenuItem;\r
                private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem;\r
-               private System.Windows.Forms.ToolStripMenuItem webGoogleSearchToolStripMenuItem;\r
-               private System.Windows.Forms.ToolStripMenuItem webOfficialToolStripMenuItem;\r
-               private System.Windows.Forms.ToolStripMenuItem webResourcesToolStripMenuItem;\r
                private System.Windows.Forms.RichTextBox detailBox;\r
                private System.Windows.Forms.SplitContainer splitContainer;\r
                private System.Windows.Forms.ToolStripPanel toolStripContainer;\r

diff --git a/AppliStation/PackageListViewForm.cs b/AppliStation/PackageListViewForm.cs
index 5c4b7b1..61f44d0 100644 (file)
--- a/AppliStation/PackageListViewForm.cs
+++ b/AppliStation/PackageListViewForm.cs
@@ -93,16 +93,21 @@ namespace AppliStation
                                        installPkgCount ++;\r
                                }\r
                        }\r
+                       \r
                        uint pkgCount = installPkgCount + uninstallPkgCount;\r
                        installBtnEnabled = (installPkgCount > 0) && (uninstallPkgCount == 0);\r
                        uninstallBtnEnabled = (uninstallPkgCount == 1) && (installPkgCount == 0);\r
                        \r
+                       // ToolStrip\r
                        informationToolStripDropDownButton.Visible = (pkgCount == 1);\r
                        uninstallToolStripButton.Visible = uninstallBtnEnabled;\r
                        installToolStripButton.Visible = installBtnEnabled;\r
+                       // MenuStrip\r
+                       webResourceToolStripMenuItem.Visible = (pkgCount == 1);\r
+                       uninstallToolStripMenuItem.Visible = uninstallBtnEnabled;\r
+                       installToolStripMenuItem.Visible = installBtnEnabled;\r
                        \r
                        // detailBoxのメッセージ設定\r
-                       detailBox.Clear();\r
                        switch (pkgCount) {\r
                                case 0:\r
                                        int count = packageListView.Items.Count;\r
@@ -140,12 +145,6 @@ namespace AppliStation
                        }\r
                }\r
                \r
-               private void buildInstalledDirectoryMenuItemStripChildren(InstalledPackage pkg)\r
-               {\r
-                       //installedDirectoryStripMenuItem.BaseFolderPath = pkg.UninstallInfo.InstallLocation;\r
-                       installedDirectoryStripMenuItem.BaseFolderPath = pkg.discoverInstalledLocation();\r
-               }\r
-               \r
                void Form_OnLoad(object sender, EventArgs e)\r
                {\r
                        packageListViewImageList.Images.Add("installed", Icon.ExtractAssociatedIcon(Application.ExecutablePath));\r
@@ -426,7 +425,7 @@ namespace AppliStation
                }\r
                \r
                \r
-               void WebOfficialToolStripMenuItemClick(object sender, EventArgs e)\r
+               void WebOfficialMenuItemClick(object sender, EventArgs e)\r
                {\r
                        Package pkg = packageListView.SelectedPackage;\r
                        if (pkg != null) {\r
@@ -442,7 +441,7 @@ namespace AppliStation
                        }\r
                }\r
                \r
-               void WebGoogleSearchToolStripMenuItemClick(object sender, EventArgs e)\r
+               void WebGoogleSearchMenuItemClick(object sender, EventArgs e)\r
                {\r
                        Package pkg = packageListView.SelectedPackage;\r
                        if (pkg != null) {\r
@@ -470,7 +469,7 @@ namespace AppliStation
                }\r
                \r
                \r
-               void PropertiesToolStripMenuItemClick(object sender, EventArgs e)\r
+               void PropertiesCommonMenuItemClick(object sender, EventArgs e)\r
                {\r
                        Package pkg = packageListView.SelectedPackage;\r
                        if (pkg != null) {\r
@@ -482,54 +481,63 @@ namespace AppliStation
                        }\r
                }\r
                \r
-               void PackageListContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)\r
+               private void updateLauncherMenuItem(AppliStation.Util.ToolStripPetitLauncherMenuItem launcherMenuItem)\r
                {\r
-                       // コンテクストメニューから開かれなかった場合はインストール/アンインストールは表示しない\r
-                       bool parentIsPkgListView = (packageListContextMenuStrip.SourceControl == packageListView);\r
-                       // メニューアイテムのインストール/アンインストールの表示はツールストリップに同じ\r
-                       installToolStripMenuItem.Visible = parentIsPkgListView && installToolStripButton.Visible;\r
-                       uninstallToolStripMenuItem.Visible = parentIsPkgListView && uninstallToolStripButton.Visible;\r
-                       \r
-                       // インストールもアンインストールもできない状態ならば、メニューを表示しない\r
-                       if (! (installToolStripButton.Visible || uninstallToolStripButton.Visible)) {\r
-                               e.Cancel = true;\r
-                               return;\r
-                       }\r
-                       \r
-                       // 選択パッケージが1つのとき\r
                        bool selectionIsOnlyOne = packageListView.SelectedItems.Count == 1;\r
+                       \r
                        if (selectionIsOnlyOne) {\r
                                Package pkg = packageListView.SelectedPackage;\r
                                InstalledPackage iPkg = pkg as InstalledPackage;\r
                                \r
-                               webResourcesToolStripMenuItem.Text = string.Format(\r
-                                       webResourcesToolStripMenuItem.Tag.ToString(),\r
-                                       pkg.Name.Replace("&", "&&")); // pkg.Nameに&が含まれているときはエンコード\r
-                               webOfficialToolStripMenuItem.Enabled = ! (pkg.Url == null || string.IsNullOrEmpty(pkg.Url.Href));\r
-                               // webGoogleSearchToolStripMenuItem always active.\r
-                               \r
                                // インストール済みパッケージのとき\r
                                if (iPkg != null) {\r
-                                       bool installedDirectoryStripMenuItemVisible = \r
+                                       bool launcherMenuItemVisible = \r
                                                (pkg.Type == InstallerType.ARCHIVE) ||\r
                                                (pkg.Type == InstallerType.ITSELF) ||\r
                                                Directory.Exists(iPkg.discoverInstalledLocation());\r
                                        \r
-                                       installedDirectoryStripMenuItem.Visible = installedDirectoryStripMenuItemVisible;\r
-                                       if (installedDirectoryStripMenuItemVisible) {\r
-                                               buildInstalledDirectoryMenuItemStripChildren(iPkg);\r
+                                       launcherMenuItem.Visible = launcherMenuItemVisible;\r
+                                       if (launcherMenuItemVisible) {\r
+                                               launcherMenuItem.BaseFolderPath = iPkg.discoverInstalledLocation();\r
                                        }\r
                                } else {\r
-                                       installedDirectoryStripMenuItem.Visible = false;\r
+                                       launcherMenuItem.Visible = false;\r
                                }\r
+                       } else {\r
+                               launcherMenuItem.Visible = false;\r
                        }\r
+               }\r
+               \r
+               void PackageListContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)\r
+               {\r
+                       bool selectionIsOnlyOne = packageListView.SelectedItems.Count == 1;\r
+                       \r
+                       // インストール先のフォルダの設定\r
+                       updateLauncherMenuItem(installedDirectoryToolStripMenuItem);\r
                        \r
-                       packageListContextMenuStripSeparator.Visible = parentIsPkgListView && selectionIsOnlyOne;\r
-                       webResourcesToolStripMenuItem.Visible = selectionIsOnlyOne;\r
-                       if (! selectionIsOnlyOne) installedDirectoryStripMenuItem.Visible = false;\r
+                       packageListContextMenuStripSeparator.Visible = selectionIsOnlyOne;\r
+                       webResourceToolStripMenuItem.Visible = selectionIsOnlyOne;\r
                        propertiesToolStripMenuItem.Visible = selectionIsOnlyOne;\r
                }\r
                \r
+               void InformationToolStripDropDownButtonDropDownOpening(object sender, EventArgs e)\r
+               {\r
+                       bool selectionIsOnlyOne = packageListView.SelectedItems.Count == 1;\r
+                       \r
+                       // インストール先のフォルダの設定\r
+                       updateLauncherMenuItem(installedDirectoryMenuItem);\r
+                       \r
+                       webResourceMenuItem.Visible = selectionIsOnlyOne;\r
+                       propertiesMenuItem.Visible = selectionIsOnlyOne;\r
+               }\r
+               \r
+               void WebResourceCommonContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)\r
+               {\r
+                       Package pkg = packageListView.SelectedPackage;\r
+                       webOfficialMenuItem.Enabled = (pkg != null && pkg.Url != null && !string.IsNullOrEmpty(pkg.Url.Href));\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