OSDN Git Service

AppliStation-GUI,メインウィンドウに情報メニューの追加など
authorttp <ttp@users.sourceforge.jp>
Mon, 8 Sep 2008 14:03:09 +0000 (14:03 +0000)
committerttp <ttp@users.sourceforge.jp>
Mon, 8 Sep 2008 14:03:09 +0000 (14:03 +0000)
 * 情報メニューの追加
 * インストール確認ダイアログにて、ソート不可能なように変更した。
 * メインウィンドウのPackageListViewのアイコンをImageListに変更(SharpDevelopで書換える度にrevertする必要はなくなった。)

git-svn-id: http://localhost/svn/AppliStation/trunk@970 34ed2c89-c49f-4a4b-abdb-c318350108cf

AppliStation/AppliStation.Util/NativeMethods.cs
AppliStation/InstallationConfirmForm.Designer.cs
AppliStation/InstallationConfirmForm.cs
AppliStation/PackageListViewForm.Designer.cs
AppliStation/PackageListViewForm.cs
AppliStation/PackageListViewForm.resx

index 36481b0..3259167 100644 (file)
@@ -1,4 +1,8 @@
-using System;\r
+// Vistaの効果を有効にするフラグ(不要の場合はコメントアウト)\r
+#define USE_VISTA_EFFECTS\r
+\r
+using System;\r
+using System.Diagnostics;\r
 using System.Runtime.InteropServices;\r
 using System.Windows.Forms;\r
 \r
@@ -15,7 +19,6 @@ namespace AppliStation.Util
                private NativeMethods()\r
                {\r
                }\r
-               \r
 \r
                /// <summary>\r
                /// WindowsVista向け、プログレスバーステータス(色)を設定する\r
@@ -24,12 +27,14 @@ namespace AppliStation.Util
                /// <param name="state">状態。(1:Normal,2:Error,3:Paused)</param>\r
                public static void ProgressBar_SetState(ProgressBar progBar, uint state)\r
                {\r
+#if USE_VISTA_EFFECTS\r
                        try {\r
                                // status := (PBST_NORMAL | PBST_ERROR | PBST_PAUSED)\r
                                // SendMessage(progressBar.Handle, PBM_SETSTATE, state, 0);\r
                                SendMessage(progBar.Handle, 0x410, state, 0);\r
                        } catch (Exception) {\r
                        }\r
+#endif\r
                }\r
                \r
                #region タスクバーおよびタイトルバーのフラッシュ\r
@@ -128,6 +133,7 @@ namespace AppliStation.Util
                /// <param name="listView">対象のListView</param>\r
                public static void ListView_EnableVistaExplorerTheme(ListView listView)\r
                {\r
+#if USE_VISTA_EFFECTS\r
                        // Vista未満はなにもしない\r
                        OperatingSystem os = Environment.OSVersion;\r
                        if (os.Platform != PlatformID.Win32NT || os.Version.Major < 6) return;\r
@@ -136,6 +142,24 @@ namespace AppliStation.Util
                                SetWindowTheme(listView.Handle, "explorer", null);\r
                        } catch (Exception) {\r
                        }\r
+#endif\r
+               }\r
+               \r
+               /// <summary>\r
+               /// ヘッダに"すべて選択"に似たチェックボックスを作るか否かを指定する\r
+               /// </summary>\r
+               /// <remarks>このオプションを設定するとVistaエクスプローラでの「チェックボックスを使用して項目を選択する」と同様の動作になる</remarks>\r
+               /// <param name="listView">対象のListBox</param>\r
+               /// <param name="bAutoCheckSelect">チェックボックスを使用して項目を選択するとき<code>true</code></param>\r
+               public static void ListView_SetAutoCheckSelect(ListView listView, bool bAutoCheckSelect)\r
+               {\r
+#if USE_VISTA_EFFECTS\r
+                       try {\r
+                               // SendMessage(listView.Handle, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_AUTOCHECKSELECT, bAutoCheckSelect?LVS_EX_AUTOCHECKSELECT:0);\r
+                               SendMessage(listView.Handle, 0x1036, 0x08000000, (bAutoCheckSelect)?0x08000000u:0x0u);\r
+                       } catch (Exception) {\r
+                       }\r
+#endif\r
                }\r
                \r
                #region ColumnHeaderのソートの三角印用\r
index 9f57717..01d2e8c 100644 (file)
@@ -139,6 +139,7 @@ namespace AppliStation
                        this.instsListView.ContextMenuStrip = this.instListViewContextMenuStrip;\r
                        this.instsListView.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.instsListView.GridLines = true;\r
+                       this.instsListView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;\r
                        this.instsListView.Location = new System.Drawing.Point(5, 53);\r
                        this.instsListView.Margin = new System.Windows.Forms.Padding(5, 3, 5, 5);\r
                        this.instsListView.Name = "instsListView";\r
@@ -148,10 +149,9 @@ namespace AppliStation
                        this.instsListView.TabIndex = 2;\r
                        this.instsListView.UseCompatibleStateImageBehavior = false;\r
                        this.instsListView.View = System.Windows.Forms.View.Details;\r
+                       this.instsListView.DrawColumnHeader += new System.Windows.Forms.DrawListViewColumnHeaderEventHandler(this.InstsListViewDrawColumnHeader);\r
                        this.instsListView.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.InstsListViewItemChecked);\r
                        this.instsListView.DrawSubItem += new System.Windows.Forms.DrawListViewSubItemEventHandler(this.InstsListViewDrawSubItem);\r
-                       this.instsListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.InstsListViewColumnClick);\r
-                       this.instsListView.DrawColumnHeader += new System.Windows.Forms.DrawListViewColumnHeaderEventHandler(this.InstsListViewDrawColumnHeader);\r
                        // \r
                        // nameColumnHeader\r
                        // \r
@@ -181,32 +181,32 @@ namespace AppliStation
                                                                        this.selectAllInstsStripMenuItem,\r
                                                                        this.unselectAllInstsStripMenuItem});\r
                        this.instListViewContextMenuStrip.Name = "packageListViewContextMenuStrip";\r
-                       this.instListViewContextMenuStrip.Size = new System.Drawing.Size(220, 76);\r
+                       this.instListViewContextMenuStrip.Size = new System.Drawing.Size(263, 76);\r
                        this.instListViewContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.InstsListViewContextMenuStripOpening);\r
                        // \r
                        // silentInstallStripMenuItem\r
                        // \r
                        this.silentInstallStripMenuItem.Name = "silentInstallStripMenuItem";\r
-                       this.silentInstallStripMenuItem.Size = new System.Drawing.Size(219, 22);\r
+                       this.silentInstallStripMenuItem.Size = new System.Drawing.Size(262, 22);\r
                        this.silentInstallStripMenuItem.Text = "サイレントインストールをする(&S)";\r
                        this.silentInstallStripMenuItem.Click += new System.EventHandler(this.SilentInstallStripMenuItemClick);\r
                        // \r
                        // instListToolStripSeparator\r
                        // \r
                        this.instListToolStripSeparator.Name = "instListToolStripSeparator";\r
-                       this.instListToolStripSeparator.Size = new System.Drawing.Size(216, 6);\r
+                       this.instListToolStripSeparator.Size = new System.Drawing.Size(259, 6);\r
                        // \r
                        // selectAllInstsStripMenuItem\r
                        // \r
                        this.selectAllInstsStripMenuItem.Name = "selectAllInstsStripMenuItem";\r
-                       this.selectAllInstsStripMenuItem.Size = new System.Drawing.Size(219, 22);\r
+                       this.selectAllInstsStripMenuItem.Size = new System.Drawing.Size(262, 22);\r
                        this.selectAllInstsStripMenuItem.Text = "全て選択(&A)";\r
                        this.selectAllInstsStripMenuItem.Click += new System.EventHandler(this.SelectAllInstsStripMenuItemClick);\r
                        // \r
                        // unselectAllInstsStripMenuItem\r
                        // \r
                        this.unselectAllInstsStripMenuItem.Name = "unselectAllInstsStripMenuItem";\r
-                       this.unselectAllInstsStripMenuItem.Size = new System.Drawing.Size(219, 22);\r
+                       this.unselectAllInstsStripMenuItem.Size = new System.Drawing.Size(262, 22);\r
                        this.unselectAllInstsStripMenuItem.Text = "全ての選択を解除(&U)";\r
                        this.unselectAllInstsStripMenuItem.Click += new System.EventHandler(this.UnselectAllInstsStripMenuItemClick);\r
                        // \r
index 9cc7f04..97f46d1 100644 (file)
@@ -53,6 +53,8 @@ namespace AppliStation
                                runasCheckBox.Checked = false;\r
                                runasCheckBox.Visible = false;\r
                        }\r
+                       \r
+                       // ListViewの効果\r
                        AppliStation.Util.NativeMethods.ListView_EnableVistaExplorerTheme(instsListView);\r
                        AppliStation.Util.NativeMethods.ListView_SetDoubleBuffer(instsListView, true);\r
                }\r
@@ -157,39 +159,6 @@ namespace AppliStation
                        \r
                        okButton.Enabled = checkeds != null && checkeds.Count > 0;\r
                }\r
-               \r
-               AppliStation.Util.ListViewItemSortComparer packageListViewSortComparer;\r
-\r
-               void InstsListViewColumnClick(object sender, ColumnClickEventArgs e)\r
-               {\r
-                       SortOrder order = SortOrder.None;\r
-                       \r
-                       if (packageListViewSortComparer == null) {\r
-                               order = SortOrder.Ascending;\r
-                               packageListViewSortComparer = new AppliStation.Util.ListViewItemSortComparer(e.Column, order);\r
-                               instsListView.ListViewItemSorter = packageListViewSortComparer;\r
-                       } else {\r
-                               if (packageListViewSortComparer.Column == e.Column) {\r
-                                       order = (packageListViewSortComparer.Order == SortOrder.Ascending)? SortOrder.Descending : SortOrder.Ascending;\r
-                                       \r
-                                       packageListViewSortComparer.Order = order;\r
-                               } else {\r
-                                       order = packageListViewSortComparer.Order;\r
-                                       packageListViewSortComparer.Column = e.Column;\r
-                               }\r
-                               \r
-                               instsListView.Sort();\r
-                       }\r
-                       AppliStation.Util.NativeMethods.ColumnHeader_SetSortState(instsListView, e.Column, order);\r
-                       \r
-                       // ソート対象列の色付け\r
-                       try {\r
-                               // SendMessage(hWnd, LVM_SETSELECTEDCOLUMN, column, NULL);\r
-                               AppliStation.Util.NativeMethods.SendMessage(instsListView.Handle, 0x1000+140, (uint) e.Column, 0);\r
-                       } catch (Exception) {   \r
-                       }\r
-               }\r
-               \r
                                \r
                void InstsListViewContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)\r
                {\r
index 27ee4bd..ee9ac19 100644 (file)
@@ -30,7 +30,7 @@
                {\r
                        this.components = new System.ComponentModel.Container();\r
                        System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PackageListViewForm));\r
-                       this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
+                       this.packageListContextMenuStripSeparator = new System.Windows.Forms.ToolStripSeparator();\r
                        this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
                        this.toolStripContainer = new System.Windows.Forms.ToolStripPanel();\r
                        this.packageListFilterToolStrip = new System.Windows.Forms.ToolStrip();\r
                        this.updateToolStripButton = new System.Windows.Forms.ToolStripSplitButton();\r
                        this.localUpdateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.upgradeToolStripButton = new System.Windows.Forms.ToolStripButton();\r
-                       this.packageCommandsToolStripSeparator = new System.Windows.Forms.ToolStripSeparator();\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
-                       this.packageListView = new System.Windows.Forms.ListView();\r
-                       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.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.webGoogleSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.installedDirectoryStripMenuItem = new AppliStation.Util.ToolStripPetitLauncherMenuItem();\r
                        this.propertiesToolStripMenuItem = 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
+                       this.packageListView = new System.Windows.Forms.ListView();\r
+                       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.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.splitContainer.Panel1.SuspendLayout();\r
                        this.splitContainer.Panel2.SuspendLayout();\r
                        this.splitContainer.SuspendLayout();\r
-                       this.packageListContextMenuStrip.SuspendLayout();\r
                        this.SuspendLayout();\r
                        // \r
-                       // toolStripSeparator1\r
+                       // packageListContextMenuStripSeparator\r
                        // \r
-                       this.toolStripSeparator1.Name = "toolStripSeparator1";\r
-                       this.toolStripSeparator1.Size = new System.Drawing.Size(201, 6);\r
+                       this.packageListContextMenuStripSeparator.Name = "packageListContextMenuStripSeparator";\r
+                       this.packageListContextMenuStripSeparator.Size = new System.Drawing.Size(236, 6);\r
                        // \r
                        // tableLayoutPanel1\r
                        // \r
                                                                        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(175, 25);\r
+                       this.packageListFilterToolStrip.Size = new System.Drawing.Size(177, 25);\r
                        this.packageListFilterToolStrip.TabIndex = 1;\r
                        // \r
                        // packageFilterToolStripDropDownButton\r
                        // allPackageFilterToolStripMenuItem\r
                        // \r
                        this.allPackageFilterToolStripMenuItem.Name = "allPackageFilterToolStripMenuItem";\r
-                       this.allPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(150, 22);\r
+                       this.allPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(160, 22);\r
                        this.allPackageFilterToolStripMenuItem.Text = "全て";\r
                        this.allPackageFilterToolStripMenuItem.ToolTipText = "全てのソフトを表示";\r
                        this.allPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
                        // notInstalledPackageFilterToolStripMenuItem\r
                        // \r
                        this.notInstalledPackageFilterToolStripMenuItem.Name = "notInstalledPackageFilterToolStripMenuItem";\r
-                       this.notInstalledPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(150, 22);\r
+                       this.notInstalledPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(160, 22);\r
                        this.notInstalledPackageFilterToolStripMenuItem.Text = "未インストール";\r
                        this.notInstalledPackageFilterToolStripMenuItem.ToolTipText = "インストールされていないソフトを表示";\r
                        this.notInstalledPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
                        // installedASPackageFilterToolStripMenuItem\r
                        // \r
                        this.installedASPackageFilterToolStripMenuItem.Name = "installedASPackageFilterToolStripMenuItem";\r
-                       this.installedASPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(150, 22);\r
+                       this.installedASPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(160, 22);\r
                        this.installedASPackageFilterToolStripMenuItem.Text = "AppliStation内";\r
                        this.installedASPackageFilterToolStripMenuItem.ToolTipText = "AppliStationにインストールされているソフトを表示";\r
                        this.installedASPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
                        // installedSysPackageFilterToolStripMenuItem\r
                        // \r
                        this.installedSysPackageFilterToolStripMenuItem.Name = "installedSysPackageFilterToolStripMenuItem";\r
-                       this.installedSysPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(150, 22);\r
+                       this.installedSysPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(160, 22);\r
                        this.installedSysPackageFilterToolStripMenuItem.Text = "コンピュータ内";\r
                        this.installedSysPackageFilterToolStripMenuItem.ToolTipText = "コンピュータにインストールされているソフトを表示";\r
                        this.installedSysPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
                        this.packageCommandsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
                                                                        this.updateToolStripButton,\r
                                                                        this.upgradeToolStripButton,\r
-                                                                       this.packageCommandsToolStripSeparator,\r
+                                                                       this.informationToolStripDropDownButton,\r
                                                                        this.installToolStripButton,\r
                                                                        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(221, 25);\r
+                       this.packageCommandsToolStrip.Size = new System.Drawing.Size(489, 25);\r
                        this.packageCommandsToolStrip.TabIndex = 2;\r
                        // \r
                        // updateToolStripButton\r
                                                                        this.localUpdateToolStripMenuItem});\r
                        this.updateToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("updateToolStripButton.Image")));\r
                        this.updateToolStripButton.Name = "updateToolStripButton";\r
-                       this.updateToolStripButton.Size = new System.Drawing.Size(111, 22);\r
+                       this.updateToolStripButton.Size = new System.Drawing.Size(131, 22);\r
                        this.updateToolStripButton.Text = "リストの更新(&U)";\r
-                       this.updateToolStripButton.ToolTipText = "ソフトリスト更新(U)";\r
+                       this.updateToolStripButton.ToolTipText = "ソフトリストを更新します";\r
                        this.updateToolStripButton.ButtonClick += new System.EventHandler(this.UpdateToolStripButtonClick);\r
                        // \r
                        // localUpdateToolStripMenuItem\r
                        // \r
                        this.localUpdateToolStripMenuItem.Name = "localUpdateToolStripMenuItem";\r
                        this.localUpdateToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5;\r
-                       this.localUpdateToolStripMenuItem.Size = new System.Drawing.Size(256, 22);\r
+                       this.localUpdateToolStripMenuItem.Size = new System.Drawing.Size(296, 22);\r
                        this.localUpdateToolStripMenuItem.Text = "インストール済ソフトの読み直し(&R)";\r
                        this.localUpdateToolStripMenuItem.Click += new System.EventHandler(this.LocalupdateToolStripMenuItemClick);\r
                        // \r
                        // \r
                        this.upgradeToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("upgradeToolStripButton.Image")));\r
                        this.upgradeToolStripButton.Name = "upgradeToolStripButton";\r
-                       this.upgradeToolStripButton.Size = new System.Drawing.Size(100, 22);\r
+                       this.upgradeToolStripButton.Size = new System.Drawing.Size(119, 22);\r
                        this.upgradeToolStripButton.Text = "ソフトの更新(&G)";\r
+                       this.upgradeToolStripButton.ToolTipText = "最新版のソフトを取得して更新します";\r
                        this.upgradeToolStripButton.Click += new System.EventHandler(this.UpgradeToolStripButtonClick);\r
                        // \r
-                       // packageCommandsToolStripSeparator\r
+                       // informationToolStripDropDownButton\r
+                       // \r
+                       this.informationToolStripDropDownButton.DropDown = this.packageListContextMenuStrip;\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.Text = "情報(&D)";\r
+                       this.informationToolStripDropDownButton.ToolTipText = "選択されたソフトの情報を調べます";\r
+                       this.informationToolStripDropDownButton.Visible = false;\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.webResourcesToolStripMenuItem,\r
+                                                                       this.installedDirectoryStripMenuItem,\r
+                                                                       this.propertiesToolStripMenuItem});\r
+                       this.packageListContextMenuStrip.Name = "packageListContextMenuStrip";\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
+                       // \r
+                       // webResourcesToolStripMenuItem\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
+                       // \r
+                       // webOfficialToolStripMenuItem\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
+                       // \r
+                       // webGoogleSearchToolStripMenuItem\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
+                       // \r
+                       // installedDirectoryStripMenuItem\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
+                       // \r
+                       // propertiesToolStripMenuItem\r
                        // \r
-                       this.packageCommandsToolStripSeparator.Name = "packageCommandsToolStripSeparator";\r
-                       this.packageCommandsToolStripSeparator.Size = new System.Drawing.Size(6, 25);\r
-                       this.packageCommandsToolStripSeparator.Visible = false;\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
                        // \r
                        // installToolStripButton\r
                        // \r
                        this.installToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("installToolStripButton.Image")));\r
                        this.installToolStripButton.Name = "installToolStripButton";\r
-                       this.installToolStripButton.Size = new System.Drawing.Size(80, 22);\r
-                       this.installToolStripButton.Text = "インストール";\r
-                       this.installToolStripButton.ToolTipText = "é\81¸æ\8a\9eã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bã\82¢ã\83\97ã\83ªã\82±ã\83¼ã\82·ã\83§ã\83³ã\82\92ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«";\r
+                       this.installToolStripButton.Size = new System.Drawing.Size(115, 22);\r
+                       this.installToolStripButton.Text = "インストール(&I)";\r
+                       this.installToolStripButton.ToolTipText = "é\81¸æ\8a\9eã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bã\82½ã\83\95ã\83\88ã\82\92ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\97ã\81¾ã\81\99";\r
                        this.installToolStripButton.Visible = false;\r
                        this.installToolStripButton.Click += new System.EventHandler(this.InstallToolStripButtonClick);\r
                        // \r
                        // \r
                        this.uninstallToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("uninstallToolStripButton.Image")));\r
                        this.uninstallToolStripButton.Name = "uninstallToolStripButton";\r
-                       this.uninstallToolStripButton.Size = new System.Drawing.Size(98, 22);\r
-                       this.uninstallToolStripButton.Text = "アンインストール";\r
-                       this.uninstallToolStripButton.ToolTipText = "é\81¸æ\8a\9eã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bã\82¢ã\83\97ã\83ªã\82±ã\83¼ã\82·ã\83§ã\83³ã\82\92ã\82¢ã\83³ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«";\r
+                       this.uninstallToolStripButton.Size = new System.Drawing.Size(143, 22);\r
+                       this.uninstallToolStripButton.Text = "アンインストール(&U)";\r
+                       this.uninstallToolStripButton.ToolTipText = "é\81¸æ\8a\9eã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bã\82½ã\83\95ã\83\88ã\82\92ã\82¢ã\83³ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\97ã\81¾ã\81\99";\r
                        this.uninstallToolStripButton.Visible = false;\r
                        this.uninstallToolStripButton.Click += new System.EventHandler(this.UninstallToolStripButtonClick);\r
                        // \r
                        this.packageListView.Location = new System.Drawing.Point(0, 0);\r
                        this.packageListView.Name = "packageListView";\r
                        this.packageListView.Size = new System.Drawing.Size(486, 225);\r
+                       this.packageListView.SmallImageList = this.packageListViewImageList;\r
                        this.packageListView.TabIndex = 0;\r
                        this.packageListView.UseCompatibleStateImageBehavior = false;\r
                        this.packageListView.View = System.Windows.Forms.View.Details;\r
                        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.toolStripSeparator1,\r
-                                                                       this.webResourcesToolStripMenuItem,\r
-                                                                       this.installedDirectoryStripMenuItem,\r
-                                                                       this.propertiesToolStripMenuItem});\r
-                       this.packageListContextMenuStrip.Name = "packageListContextMenuStrip";\r
-                       this.packageListContextMenuStrip.Size = new System.Drawing.Size(205, 142);\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(204, 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(204, 22);\r
-                       this.uninstallToolStripMenuItem.Text = "アンインストール(&U)...";\r
-                       this.uninstallToolStripMenuItem.Click += new System.EventHandler(this.UninstallToolStripButtonClick);\r
+                       // packageListViewImageList\r
                        // \r
-                       // webResourcesToolStripMenuItem\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(204, 22);\r
-                       this.webResourcesToolStripMenuItem.Tag = "\"{0}\"に関するWebページ(&W)";\r
-                       // \r
-                       // webOfficialToolStripMenuItem\r
-                       // \r
-                       this.webOfficialToolStripMenuItem.Name = "webOfficialToolStripMenuItem";\r
-                       this.webOfficialToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
-                       this.webOfficialToolStripMenuItem.Text = "公式サイト(&O)";\r
-                       this.webOfficialToolStripMenuItem.Click += new System.EventHandler(this.WebOfficialToolStripMenuItemClick);\r
-                       // \r
-                       // webGoogleSearchToolStripMenuItem\r
-                       // \r
-                       this.webGoogleSearchToolStripMenuItem.Name = "webGoogleSearchToolStripMenuItem";\r
-                       this.webGoogleSearchToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
-                       this.webGoogleSearchToolStripMenuItem.Text = "Google検索(&G)";\r
-                       this.webGoogleSearchToolStripMenuItem.Click += new System.EventHandler(this.WebGoogleSearchToolStripMenuItemClick);\r
-                       // \r
-                       // installedDirectoryStripMenuItem\r
-                       // \r
-                       this.installedDirectoryStripMenuItem.Name = "installedDirectoryStripMenuItem";\r
-                       this.installedDirectoryStripMenuItem.Size = new System.Drawing.Size(204, 22);\r
-                       this.installedDirectoryStripMenuItem.Text = "インストール先のフォルダ(&O)";\r
-                       this.installedDirectoryStripMenuItem.InvokerForm = this;\r
-                       // \r
-                       // propertiesToolStripMenuItem\r
-                       // \r
-                       this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";\r
-                       this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(204, 22);\r
-                       this.propertiesToolStripMenuItem.Text = "プロパティ(&R)";\r
-                       this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesToolStripMenuItemClick);\r
+                       this.packageListViewImageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("packageListViewImageList.ImageStream")));\r
+                       this.packageListViewImageList.TransparentColor = System.Drawing.Color.Transparent;\r
+                       this.packageListViewImageList.Images.SetKeyName(0, "sys");\r
                        // \r
                        // detailBox\r
                        // \r
                        this.packageListFilterToolStrip.PerformLayout();\r
                        this.packageCommandsToolStrip.ResumeLayout(false);\r
                        this.packageCommandsToolStrip.PerformLayout();\r
+                       this.packageListContextMenuStrip.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.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.ToolStripSeparator packageCommandsToolStripSeparator;\r
                private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem;\r
-               private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;\r
                private System.Windows.Forms.ToolStripMenuItem webGoogleSearchToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripMenuItem webOfficialToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripMenuItem webResourcesToolStripMenuItem;\r
index 3736ba3..13f03da 100644 (file)
@@ -82,9 +82,10 @@ 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
-                       packageCommandsToolStripSeparator.Visible = uninstallBtnEnabled || installBtnEnabled;\r
                        \r
                        switch (selectedPkgs.Length) {\r
                                case 0:\r
@@ -170,15 +171,11 @@ namespace AppliStation
                \r
                void Form_OnLoad(object sender, EventArgs e)\r
                {\r
-                       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PackageListViewForm));\r
-                       ImageList imageList = new ImageList();\r
-                       imageList.Images.Add("installed", this.Icon);\r
-                       imageList.Images.Add("sys", (Icon)(resources.GetObject("sysinstalled.Icon")));\r
-                       packageListView.SmallImageList = imageList;\r
+                       packageListViewImageList.Images.Add("installed", Icon.ExtractAssociatedIcon(Application.ExecutablePath));\r
                        \r
                        updatePackageFilterToolStripMenuItemCheckState();\r
-                       installedASPackageFilterToolStripMenuItem.Image = this.Icon.ToBitmap();\r
-                       installedSysPackageFilterToolStripMenuItem.Image = ((Icon)(resources.GetObject("sysinstalled.Icon"))).ToBitmap();\r
+                       installedASPackageFilterToolStripMenuItem.Image = packageListViewImageList.Images["installed"];\r
+                       installedSysPackageFilterToolStripMenuItem.Image = packageListViewImageList.Images["sys"];\r
                }\r
                \r
                #region PackageFilter関連\r
@@ -551,9 +548,11 @@ namespace AppliStation
                \r
                void PackageListContextMenuStripOpening(object sender, System.ComponentModel.CancelEventArgs e)\r
                {\r
+                       // コンテクストメニューから開かれなかった場合はインストール/アンインストールは表示しない\r
+                       bool parentIsPkgListView = (packageListContextMenuStrip.SourceControl == packageListView);\r
                        // メニューアイテムのインストール/アンインストールの表示はツールストリップに同じ\r
-                       installToolStripMenuItem.Visible = installToolStripButton.Visible;\r
-                       uninstallToolStripMenuItem.Visible = uninstallToolStripButton.Visible;\r
+                       installToolStripMenuItem.Visible = parentIsPkgListView && installToolStripButton.Visible;\r
+                       uninstallToolStripMenuItem.Visible = parentIsPkgListView && uninstallToolStripButton.Visible;\r
                        \r
                        // インストールもアンインストールもできない状態ならば、メニューを表示しない\r
                        if (! (installToolStripButton.Visible || uninstallToolStripButton.Visible)) {\r
@@ -581,7 +580,7 @@ namespace AppliStation
                                }\r
                        }\r
                        \r
-                       toolStripSeparator1.Visible = selectionIsOnlyOne;\r
+                       packageListContextMenuStripSeparator.Visible = parentIsPkgListView && selectionIsOnlyOne;\r
                        webResourcesToolStripMenuItem.Visible = selectionIsOnlyOne;\r
                        if (! selectionIsOnlyOne) installedDirectoryStripMenuItem.Visible = false;\r
                        propertiesToolStripMenuItem.Visible = selectionIsOnlyOne;\r
index adca5e9..04249b8 100644 (file)
         ZdU5k5jcQBKTB1rOZ1/i81oD6/iJgX+xg9F34x/0jcPn/5nC5h3IH5TSYb0vmXYTAAAAAElFTkSuQmCC\r
 </value>\r
   </data>\r
+  <metadata name="packageListContextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>511, 17</value>\r
+  </metadata>\r
+  <data name="informationToolStripDropDownButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+    <value>\r
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEgAA\r
+        CxIB0t1+/AAAASNJREFUOE+VkztrhUAQhZPfmCLaWgQUe0uxsJcLt7DQOsQIFrGx9lWkErGysBTf/2By\r
+        z4aV3BA1LnysLjvnzOzsPj7chm3b723bPuH7xHjWdf2N7TcMg84OxKxmXGAYBuq6jtH3/QrWwTiOtCwL\r
+        8/pTAIFxHFOSJIw0Te/IsuxYgDvLskycoiiY+zRN+wII5s5BEJAgCCvI5jADCMAVjqgZ83cWL+z/Xxlw\r
+        V56BoigEiuLzWAAuP2vnwXyuqmr/DCDwu3ZkJIoiSZJEqqpSXdfbbeS9Rq1gnmcqy5I0TSPTNMmyLHIc\r
+        Z1sAreKnjRPP85wRhiFdLhdyXZc8z9sX4P2GO8DNA03TkO/7FEXRtsCZ93B3la/X6wcWznCLeT3xcre3\r
+        fgFcQn+1XL9JnwAAAABJRU5ErkJggg==\r
+</value>\r
+  </data>\r
   <data name="installToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
         P90Qa56ijxDNAAAAAElFTkSuQmCC\r
 </value>\r
   </data>\r
-  <data name="sysinstalled.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+  <metadata name="packageListViewImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>17, 54</value>\r
+  </metadata>\r
+  <data name="packageListViewImageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">\r
     <value>\r
-        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\r
-        AQAAAAEA8AABAPAAAQDwAAEA8AABAPAAAQD///8A////AP///wAoAAAAEAAAACAAAAABACAAAAAAAEAE\r
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAJGQkP97eXn/kZCQ/wAAAAAAAAAAAAAAALu8vP+7vLz/tLW1/5uc\r
-        nP+bnJz/n6Cg/6CgoP8AAAAAAAAAAAAAAAC0tLTTlJSU/56ens0AAAAAAAAAAAAAAADS0tKCyMnJ/8TG\r
-        xv+5urr/qqur/6CgoP+goKBhAAAAAAAAAAAAAAAAq6ur97+/v/+lpaX/AAAAAAAAAAAAAAAAAAAAAN7e\r
-        3ja5urr/ioqK/5eXl+ygoKA2AAAAAAAAAAAAAAAAAAAAAK6urvfR0dH/q6ur/8PExIbAwcH/vr+//7u8\r
-        vP+4ubn/tba2/6qqqv+oqKj/pqam/6SkpP+ioqL/oKCg/6CgoJWtra330dHR/6urq//Nz8//zc/P/83O\r
-        z//Mzs7/y83N/8rMzP/Hycn/xsnJ/8bJyf/FyMj/xcjI/8THx/+goKD/ra2t99HR0f+rq6v/ztDQ/62u\r
-        rv+nDw//qxMN/6gODv+pICD/tD8v/9QbAf/UHQH/2B0A/8slA//FyMj/oaGh/66urvfR0dH/rKys/8/R\r
-        0f+rrKz/siwj/7MxIv+5HQz/ycXE/8xxY//XRyz/3kAl/+NEJ//dOxD/xMfH/6Ojo/+WvaP3APJI/2LC\r
-        gv/P0dH/qamp/7RANf+0LyL/19bV/+7u7v/4+Pj/s42H/9tYO//dXEH/3k8t/8XIyP+lpaX/q6ur90hE\r
-        Q/97eXn/0dLS/6Ojo/+4Qzr/wEE0/9zKyf/YGgD/1IJ1///////WalP/1WxZ/9piSP/Hysr/q6ur/76+\r
-        vpS+vr7/vr6+wNDS0v+ioqL/vC8k/8UcCf/aHgD/5hsA//9ZNv/zpJD/2dnZ//9qPP//ZTH/x8rK/62u\r
-        rv8AAAAAAAAAAAAAAADR0tP/oKCg/8UYB//UGAH/4yYA/+0aAP//cEv//2tI/+Hh4f/Aurj//2s//8jK\r
-        y/+wsbH/AAAAAAAAAAAAAAAA0dLT/6CgoP/KBAT/3A8A/+gSAP/3FgD//388/9aCXP/Xg1n/2oFR/99z\r
-        Q//Jy8v/srOz/wAAAAAAAAAAAAAAANHS0/+goKD/oKCg/6CgoP+ioqL/pKSk/62urv+wsLD/srOz/7W2\r
-        tv+4ubn/ycvM/7W2tv8AAAAAAAAAAAAAAADR0tN40dLT/9HS0//R0tP/0NLS/9DR0v/O0ND/zc/P/83P\r
-        z//Mzs7/y83N/8rMzP+4ubmVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AAAcBwAAHAcAAB4PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
-        AAAAAAAA4AAAAOAAAADgAAAA4AAAAP//AAA=\r
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w\r
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM\r
+        BQAAAk1TRnQBSQFMAwEBAAEEAQABBAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA\r
+        ARADAAEBAQABIAYAARD/AC8AAzsBZAPVAf8D4gH/A9YB/wPIAf8DOQFfBAADAQEC3AADkAHnA8cB/wPU\r
+        Af8D4QH/A88B/wO9Af8DtgH/A7AB/wMnAToDEQEX2AADkQHhA78B/wPJAf8C0gHUAf8DxgH/A6IB/wOE\r
+        Af8DgwHvAxIBGAMOARPEAAGeAZsBmQH/AuAB4QH/A0cB+wObAfgDQQFzBAADLwFJA4gB7gJ0AXIB/wFx\r
+        AW4BcQH/AZ4BnwGhAf8BtwHHAcsB/wHPAekB7AH/AtMB1AH/yAABwAG6AbsB/wGtAqwB/wGqAqkB/wPX\r
+        Af8BWQJYAeEBZAFmAWkB8QGxAcIBxwH/AawByAHOAf8BvQHGAcgB/wHHAawBqgH/AcUBZgFWAf8BrwEC\r
+        AQAB/wGZAgAB/wHDAeAB5AH/yAAB0gHNAcwB/wGuAawBrwH/A5cB/wGnAbUBtgH/AboCpwH/AaIBTQFP\r
+        Af8BjgEOAQ0B/wGBAgAB/wGNAgAB/wGvAS4BGgH/AbsBOQEmAf8BwgE+ASoB/wHIASYBDQH/AcYB6QHt\r
+        Af/IAAHeAdYB2AH/Aa4BsAGuAf8DoAH/AYEBKAEkAf8BjQESAQYB/wGLARQBCQH/AZABDQEAAf8BsQGn\r
+        AaUB/wFzARsBEwH/AdEBYgFPAf8B1wFfAUsB/wHdAWQBTwH/AeYBXAFEAf8B0AHlAeYB/wMgAS7EAAHR\r
+        As0B/wGyArEB/wOzAf8BmgFzAXYB/wGeATcBLwH/AZcBLgEkAf8B1wHMAcsB/wGbAWABWAH/A98B/wHi\r
+        AY8BggH/AekBhwFyAf8B7gGKAXYB/wHzAY8BdgH/AdUB0gHRAf8DOAFdxAABrwGqAagB/wG9AbQBuwH/\r
+        Ab8BvQG/Af8BsAG2AboB/wGuAVMBTAH/AZUBFgEPAf8BlAEzASUB/wG3ARQBAAH/AbMBZQFiAf8BuQGw\r
+        Aa4B/wH1AagBmQH/AfoBrQGcAv8BsQGlAf8B7QG/AbcB/wNIAYHFAAF4ATYB/wHYAcQB0AH/A8oB/wG8\r
+        Ac4B0QH/Ab4BbQFlAf8BmwIAAf8BvgEWAQAB/wHWASEBAAH/AfABKQEBAf8B4AHdAdwB/wGnAYoBggL/\r
+        AcwBvAL/AdUBxQH/AfQBwwGtAf8DeAHgxAABdwFxAXQB/wH1AfYB+QH/A+EB/wHBAdIB1wH/AaEBJQEW\r
+        Af8BrwEUAQAB/wHHARoBAAH/Ad8BIwEAAf8B+wF0AVoB/wH4AdUByAH/A9QB/wHJAbMBqAL/AeQB2wL/\r
+        AcoBswH/AZsBnQGgAf/IAAMRARcDYQG4AcMBzwHSAf8BjQIAAf8BtQEZAQAB/wHPAR0BAAH/AeYBFQEA\r
+        Av8B4gHXAv8B7QHpAf8B7gHiAdoB/wHsAdsB0gL/AeUB1QH/AfsBuwGeAf8BsQG6AbwB/9AAA0ABbQGF\r
+        AgAB/wGzAQUBAAH/Ab8BKQEXAf8B1gFUAUIB/wHVAa4BpAH/AdABtQGvAf8BxwLKAf8BygHRAdQB/wF4\r
+        AX0BfwHNAU8CUAGPAzMBUdAAAwkBDAFuAXEBcwG+Az8BawMmATgDFgEe/wDdAAFCAU0BPgcAAT4DAAEo\r
+        AwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAC/wYAAf4BBQYAAfwHAAH8BwABggEBBgABgAEBBgABgAEB\r
+        BgABgAcAAYAHAAGABwABgAcAAYAHAAHABwAB8AcAAfABfwYAAv8GAAs=\r
 </value>\r
   </data>\r
-  <metadata name="packageListFilterToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>127, 17</value>\r
-  </metadata>\r
-  <metadata name="packageCommandsToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>314, 17</value>\r
-  </metadata>\r
-  <metadata name="packageListContextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>511, 17</value>\r
-  </metadata>\r
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>53</value>\r
   </metadata>\r
-</root>\r
+</root>
\ No newline at end of file