AppliStation-GUI,プロキシ設定GUIの改善

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

diff --git a/AppliStation/PackageListViewForm.Designer.cs b/AppliStation/PackageListViewForm.Designer.cs
index ee9ac19..c9c1699 100644 (file)
--- a/AppliStation/PackageListViewForm.Designer.cs
+++ b/AppliStation/PackageListViewForm.Designer.cs
@@ -41,8 +41,11 @@
                        this.installedSysPackageFilterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.searchTextBox = new AppliStation.Util.ToolStripWeb2LikeTextBox();\r
                        this.packageCommandsToolStrip = new System.Windows.Forms.ToolStrip();\r
-                       this.updateToolStripButton = new System.Windows.Forms.ToolStripSplitButton();\r
-                       this.localUpdateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+                       this.organizeToolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();\r
+                       this.updateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+                       this.localupdateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+                       this.organizeToolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
+                       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
@@ -171,7 +174,7 @@
                        // \r
                        this.packageCommandsToolStrip.Dock = System.Windows.Forms.DockStyle.None;\r
                        this.packageCommandsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-                                                                       this.updateToolStripButton,\r
+                                                                       this.organizeToolStripDropDownButton1,\r
                                                                        this.upgradeToolStripButton,\r
                                                                        this.informationToolStripDropDownButton,\r
                                                                        this.installToolStripButton,\r
@@ -181,24 +184,48 @@
                        this.packageCommandsToolStrip.Size = new System.Drawing.Size(489, 25);\r
                        this.packageCommandsToolStrip.TabIndex = 2;\r
                        // \r
-                       // updateToolStripButton\r
+                       // organizeToolStripDropDownButton1\r
                        // \r
-                       this.updateToolStripButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\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(131, 22);\r
-                       this.updateToolStripButton.Text = "リストの更新(&U)";\r
-                       this.updateToolStripButton.ToolTipText = "ソフトリストを更新します";\r
-                       this.updateToolStripButton.ButtonClick += new System.EventHandler(this.UpdateToolStripButtonClick);\r
+                       this.organizeToolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+                                                                       this.updateToolStripMenuItem,\r
+                                                                       this.localupdateToolStripMenuItem,\r
+                                                                       this.organizeToolStripSeparator1,\r
+                                                                       this.optionToolStripMenuItem});\r
+                       this.organizeToolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("organizeToolStripDropDownButton1.Image")));\r
+                       this.organizeToolStripDropDownButton1.Name = "organizeToolStripDropDownButton1";\r
+                       this.organizeToolStripDropDownButton1.Size = new System.Drawing.Size(80, 22);\r
+                       this.organizeToolStripDropDownButton1.Text = "整理(&O)";\r
+                       this.organizeToolStripDropDownButton1.ToolTipText = "ソフトリストの管理など";\r
                        // \r
-                       // localUpdateToolStripMenuItem\r
+                       // updateToolStripMenuItem\r
                        // \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.Text = "インストール済ソフトの読み直し(&R)";\r
-                       this.localUpdateToolStripMenuItem.Click += new System.EventHandler(this.LocalupdateToolStripMenuItemClick);\r
+                       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.Text = "リストの更新(&U)";\r
+                       this.updateToolStripMenuItem.ToolTipText = "ソフトリストを更新します";\r
+                       this.updateToolStripMenuItem.Click += new System.EventHandler(this.UpdateToolStripMenuItemClick);\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(296, 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
+                       // \r
+                       // optionToolStripMenuItem\r
+                       // \r
+                       this.optionToolStripMenuItem.Name = "optionToolStripMenuItem";\r
+                       this.optionToolStripMenuItem.Size = new System.Drawing.Size(296, 22);\r
+                       this.optionToolStripMenuItem.Text = "設定(&O)...";\r
+                       this.optionToolStripMenuItem.Click += new System.EventHandler(this.OptionToolStripMenuItemClick);\r
                        // \r
                        // upgradeToolStripButton\r
                        // \r
@@ -229,6 +256,7 @@
                                                                        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
@@ -361,12 +389,15 @@
                        // \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
+                       this.packageListViewImageList.Images.SetKeyName(0, "available");\r
+                       this.packageListViewImageList.Images.SetKeyName(1, "available-new");\r
+                       this.packageListViewImageList.Images.SetKeyName(2, "sys");\r
                        // \r
                        // detailBox\r
                        // \r
                        this.detailBox.BackColor = System.Drawing.SystemColors.Control;\r
                        this.detailBox.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
+                       this.detailBox.DetectUrls = false;\r
                        this.detailBox.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.detailBox.ForeColor = System.Drawing.SystemColors.ControlText;\r
                        this.detailBox.Location = new System.Drawing.Point(0, 0);\r
@@ -376,7 +407,7 @@
                        this.detailBox.Size = new System.Drawing.Size(486, 81);\r
                        this.detailBox.TabIndex = 0;\r
                        this.detailBox.Text = "";\r
-                       this.detailBox.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.PackageDetailBoxLinkClicked);\r
+                       this.detailBox.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.DetailBoxLinkClicked);\r
                        // \r
                        // PackageListViewForm\r
                        // \r
@@ -401,6 +432,11 @@
                        this.splitContainer.ResumeLayout(false);\r
                        this.ResumeLayout(false);\r
                }\r
+               private System.Windows.Forms.ToolStripMenuItem optionToolStripMenuItem;\r
+               private System.Windows.Forms.ToolStripSeparator organizeToolStripSeparator1;\r
+               private System.Windows.Forms.ToolStripMenuItem localupdateToolStripMenuItem;\r
+               private System.Windows.Forms.ToolStripMenuItem updateToolStripMenuItem;\r
+               private System.Windows.Forms.ToolStripDropDownButton organizeToolStripDropDownButton1;\r
                private System.Windows.Forms.ImageList packageListViewImageList;\r
                private System.Windows.Forms.ToolStripDropDownButton informationToolStripDropDownButton;\r
                private System.Windows.Forms.ToolStripSeparator packageListContextMenuStripSeparator;\r
@@ -418,8 +454,6 @@
                private System.Windows.Forms.ToolStripMenuItem allPackageFilterToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripDropDownButton packageFilterToolStripDropDownButton;\r
                private System.Windows.Forms.ToolStripButton upgradeToolStripButton;\r
-               private System.Windows.Forms.ToolStripMenuItem localUpdateToolStripMenuItem;\r
-               private System.Windows.Forms.ToolStripSplitButton updateToolStripButton;\r
                private System.Windows.Forms.ToolStripMenuItem uninstallToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripMenuItem installToolStripMenuItem;\r
                private System.Windows.Forms.ContextMenuStrip packageListContextMenuStrip;\r