Revert "AppliStation-GUI,表示スタイルを無駄に選べるようにした。"

This reverts commit 935268ade3d3fd9c438df2701891bab57027be15.

Conflicts:

	AppliStation/PackageListViewForm.Designer.cs
	AppliStation/PackageListViewForm.cs

diff --git a/AppliStation/PackageListViewForm.Designer.cs b/AppliStation/PackageListViewForm.Designer.cs
index 8696b2d..08b2cf5 100644 (file)
--- a/AppliStation/PackageListViewForm.Designer.cs
+++ b/AppliStation/PackageListViewForm.Designer.cs
@@ -67,10 +67,6 @@
                        this.uninstallToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.installedDirectoryToolStripMenuItem = new AppliStation.Util.ToolStripPetitLauncherMenuItem();\r
                        this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-                       this.viewStyleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-                       this.viewStyleListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-                       this.viewStyleTileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-                       this.viewStyleDetailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.columnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.nameColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
                        this.versionColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -414,10 +410,9 @@
                                                                        this.webResourceToolStripMenuItem,\r
                                                                        this.installedDirectoryToolStripMenuItem,\r
                                                                        this.propertiesToolStripMenuItem,\r
-                                                                       this.viewStyleToolStripMenuItem,\r
                                                                        this.columnToolStripMenuItem});\r
                        this.packageListContextMenuStrip.Name = "packageListContextMenuStrip";\r
-                       this.packageListContextMenuStrip.Size = new System.Drawing.Size(215, 186);\r
+                       this.packageListContextMenuStrip.Size = new System.Drawing.Size(215, 120);\r
                        this.packageListContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.PackageListContextMenuStripOpening);\r
                        // \r
                        // installToolStripMenuItem\r
@@ -448,39 +443,6 @@
                        this.propertiesToolStripMenuItem.Text = "プロパティ(&R)";\r
                        this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesCommonMenuItemClick);\r
                        // \r
-                       // viewStyleToolStripMenuItem\r
-                       // \r
-                       this.viewStyleToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-                                                                       this.viewStyleListToolStripMenuItem,\r
-                                                                       this.viewStyleTileToolStripMenuItem,\r
-                                                                       this.viewStyleDetailToolStripMenuItem});\r
-                       this.viewStyleToolStripMenuItem.Name = "viewStyleToolStripMenuItem";\r
-                       this.viewStyleToolStripMenuItem.Size = new System.Drawing.Size(214, 22);\r
-                       this.viewStyleToolStripMenuItem.Text = "表示(&V)";\r
-                       // \r
-                       // viewStyleListToolStripMenuItem\r
-                       // \r
-                       this.viewStyleListToolStripMenuItem.Name = "viewStyleListToolStripMenuItem";\r
-                       this.viewStyleListToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
-                       this.viewStyleListToolStripMenuItem.Text = "一覧(&L)";\r
-                       this.viewStyleListToolStripMenuItem.Click += new System.EventHandler(this.ViewStyleCommonToolStripMenuItemClick);\r
-                       // \r
-                       // viewStyleTileToolStripMenuItem\r
-                       // \r
-                       this.viewStyleTileToolStripMenuItem.Name = "viewStyleTileToolStripMenuItem";\r
-                       this.viewStyleTileToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
-                       this.viewStyleTileToolStripMenuItem.Text = "並べて表示(&S)";\r
-                       this.viewStyleTileToolStripMenuItem.Click += new System.EventHandler(this.ViewStyleCommonToolStripMenuItemClick);\r
-                       // \r
-                       // viewStyleDetailToolStripMenuItem\r
-                       // \r
-                       this.viewStyleDetailToolStripMenuItem.Checked = true;\r
-                       this.viewStyleDetailToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;\r
-                       this.viewStyleDetailToolStripMenuItem.Name = "viewStyleDetailToolStripMenuItem";\r
-                       this.viewStyleDetailToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
-                       this.viewStyleDetailToolStripMenuItem.Text = "詳細(&D)";\r
-                       this.viewStyleDetailToolStripMenuItem.Click += new System.EventHandler(this.ViewStyleCommonToolStripMenuItemClick);\r
-                       // \r
                        // columnToolStripMenuItem\r
                        // \r
                        this.columnToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -610,10 +572,6 @@
                private System.Windows.Forms.ToolStripMenuItem versionColumnToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripMenuItem nameColumnToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripMenuItem columnToolStripMenuItem;\r
-               private System.Windows.Forms.ToolStripMenuItem viewStyleDetailToolStripMenuItem;\r
-               private System.Windows.Forms.ToolStripMenuItem viewStyleTileToolStripMenuItem;\r
-               private System.Windows.Forms.ToolStripMenuItem viewStyleListToolStripMenuItem;\r
-               private System.Windows.Forms.ToolStripMenuItem viewStyleToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripMenuItem webResourceToolStripMenuItem;\r
                private System.Windows.Forms.ToolStripMenuItem propertiesMenuItem;\r
                private AppliStation.Util.ToolStripPetitLauncherMenuItem installedDirectoryMenuItem;\r

diff --git a/AppliStation/PackageListViewForm.cs b/AppliStation/PackageListViewForm.cs
index 6861ae1..6f23cdb 100644 (file)
--- a/AppliStation/PackageListViewForm.cs
+++ b/AppliStation/PackageListViewForm.cs
@@ -541,7 +541,6 @@ namespace AppliStation
                        packageListContextMenuStripSeparator.Visible = selectionIsOnlyOne;\r
                        webResourceToolStripMenuItem.Visible = selectionIsOnlyOne;\r
                        propertiesToolStripMenuItem.Visible = hasSelection;\r
-                       viewStyleToolStripMenuItem.Visible = ! hasSelection;\r
                        columnToolStripMenuItem.Visible = (! hasSelection) && (packageListView.View == View.Details);\r
                }\r
                \r
@@ -648,21 +647,6 @@ namespace AppliStation
                        }\r
                }\r
                \r
-               void ViewStyleCommonToolStripMenuItemClick(object sender, EventArgs e)\r
-               {\r
-                       viewStyleDetailToolStripMenuItem.Checked = (sender == viewStyleDetailToolStripMenuItem);\r
-                       viewStyleListToolStripMenuItem.Checked = (sender == viewStyleListToolStripMenuItem);\r
-                       viewStyleTileToolStripMenuItem.Checked = (sender == viewStyleTileToolStripMenuItem);\r
-                       \r
-                       if (sender == viewStyleDetailToolStripMenuItem) {\r
-                               packageListView.View = View.Details;\r
-                       } else if (sender == viewStyleListToolStripMenuItem) {\r
-                               packageListView.View = View.List;\r
-                       } else if (sender == viewStyleTileToolStripMenuItem) {\r
-                               packageListView.View = View.Tile;\r
-                       }\r
-               }\r
-               \r
                void ColumnCommonToolStripMenuItemClick(object sender, EventArgs e)\r
                {\r
                        packageListView.BeginUpdate();\r