From 3e28fce7bab7c7c65bac48ed65aba57008b221ed Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 15 Feb 2011 16:18:14 +1300 Subject: [PATCH] remove various leftover crap from editor --- OpenRA.Editor/Form1.Designer.cs | 40 +++--------------------------- OpenRA.Editor/Form1.cs | 7 ------ OpenRA.Editor/Form1.resx | 14 ----------- OpenRA.Editor/OpenRA.Editor.csproj | 11 +------- 4 files changed, 5 insertions(+), 67 deletions(-) diff --git a/OpenRA.Editor/Form1.Designer.cs b/OpenRA.Editor/Form1.Designer.cs index 019b6f2e3f..2f72c51025 100755 --- a/OpenRA.Editor/Form1.Designer.cs +++ b/OpenRA.Editor/Form1.Designer.cs @@ -62,10 +62,6 @@ this.mapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.resizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.spawnpointsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.layersFloaterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripComboBox1 = new System.Windows.Forms.ToolStripComboBox(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); @@ -258,7 +254,6 @@ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.mapToolStripMenuItem, - this.toolsToolStripMenuItem, this.toolStripComboBox1, this.toolStripLabel1}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); @@ -386,9 +381,7 @@ // this.mapToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.propertiesToolStripMenuItem, - this.resizeToolStripMenuItem, - this.toolStripSeparator4, - this.spawnpointsToolStripMenuItem}); + this.resizeToolStripMenuItem}); this.mapToolStripMenuItem.Name = "mapToolStripMenuItem"; this.mapToolStripMenuItem.Size = new System.Drawing.Size(43, 23); this.mapToolStripMenuItem.Text = "&Map"; @@ -398,7 +391,7 @@ this.propertiesToolStripMenuItem.Enabled = false; this.propertiesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("propertiesToolStripMenuItem.Image"))); this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem"; - this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.propertiesToolStripMenuItem.Text = "&Properties..."; this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.PropertiesClicked); // @@ -407,31 +400,10 @@ this.resizeToolStripMenuItem.Enabled = false; this.resizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resizeToolStripMenuItem.Image"))); this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem"; - this.resizeToolStripMenuItem.Size = new System.Drawing.Size(142, 22); + this.resizeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.resizeToolStripMenuItem.Text = "&Resize..."; this.resizeToolStripMenuItem.Click += new System.EventHandler(this.ResizeClicked); // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(139, 6); - // - // toolsToolStripMenuItem - // - this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.layersFloaterToolStripMenuItem}); - this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 23); - this.toolsToolStripMenuItem.Text = "Tools"; - this.toolsToolStripMenuItem.Visible = false; - // - // layersFloaterToolStripMenuItem - // - this.layersFloaterToolStripMenuItem.Name = "layersFloaterToolStripMenuItem"; - this.layersFloaterToolStripMenuItem.Size = new System.Drawing.Size(144, 22); - this.layersFloaterToolStripMenuItem.Text = "Layers floater"; - this.layersFloaterToolStripMenuItem.Click += new System.EventHandler(this.layersFloaterToolStripMenuItem_Click); - // // toolStripComboBox1 // this.toolStripComboBox1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -483,9 +455,9 @@ this.Name = "Form1"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "OpenRA Editor"; + this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OnFormClosing); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown); - this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); this.splitContainer1.ResumeLayout(false); @@ -547,10 +519,6 @@ private System.Windows.Forms.ToolStripMenuItem mapToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem resizeToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; - private System.Windows.Forms.ToolStripMenuItem spawnpointsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem layersFloaterToolStripMenuItem; private System.Windows.Forms.ToolStripLabel toolStripLabel1; private System.Windows.Forms.ToolStripComboBox toolStripComboBox1; diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs index 82cf732c60..def5acf9aa 100755 --- a/OpenRA.Editor/Form1.cs +++ b/OpenRA.Editor/Form1.cs @@ -223,7 +223,6 @@ namespace OpenRA.Editor propertiesToolStripMenuItem.Enabled = true; resizeToolStripMenuItem.Enabled = true; - spawnpointsToolStripMenuItem.Enabled = true; saveToolStripMenuItem.Enabled = true; saveAsToolStripMenuItem.Enabled = true; mnuMinimapToPNG.Enabled = true; // todo: what is this VB naming bullshit doing here? @@ -397,12 +396,6 @@ namespace OpenRA.Editor } } - private void layersFloaterToolStripMenuItem_Click(object sender, EventArgs e) - { - var pb = new PaletteBox(); - pb.Show(); - } - void ExportMinimap(object sender, EventArgs e) { saveFileDialog.InitialDirectory = Path.Combine(Environment.CurrentDirectory, "maps"); diff --git a/OpenRA.Editor/Form1.resx b/OpenRA.Editor/Form1.resx index 8f152bc2eb..4b24bdacaa 100755 --- a/OpenRA.Editor/Form1.resx +++ b/OpenRA.Editor/Form1.resx @@ -295,20 +295,6 @@ JL2GRAqjtMDYwV+8wzUAWeY9eIfHYW0fxNodxyGWZeOSPBvzl27C5OXnwG0T5irmr79wgdWTNYyVJFL8 kAeo8wyBA/rx2jGErBIH0nXPsWmPEHcM9YgURGPS0jMTZfiXGKDfM4Y0fVOgA/UgRQWECTpExaqxUyDF wuUbJjb4H0AQfxtrDqiweLMUc8LEmLEqnv9zUMzM9B1/cM83lepxTAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 - JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAABrUlE - QVQ4T6WTWyhDcRzHl8g1D/IkxZ4mjcgDB0U5ubbVbJLkkubJSt7w6M1eENHUENrktmzJ3HKEiSh7US5l - QiK5JUXpy/9f/9O2zhY59at//c/n87uc35EBkP0nAsL6Bi33E9CpeBINJElHthIkvBNKChh8YVPi1Cpn - Eo7ANSnJwQUMfnLEobVejZbaCnis8VRiyFSgXJ4QWOAPO5fXYJ2xo1HD48QcRSV5CfHSAn94fV0gL9Jn - eVWAtjgXRwPhrJ18Ngc6g2AwkzhXBJTmZ+GgN8xHwgRgPXtnZvDH5xde3j6x6BTAcxk47JFRCUnOBAWF - 2WkQhC2xbH/49uEd59evGLfYoJAnEkGjKCCHyjqDDzw72YOpUSMmTF0w93VS2H32iLmlXSSlcuIgxT1Q - VTf7CAj87IjFgy2Gfk4Cu9x3sNhd0oIyXZMoID2TzPez0biyREKvK6bw6t4NxuYDCEo0ZFsBNjBStmci - Asb2Kmj4HAovbF5ieHpHugJeXUfhja19rGzsYai7DcemULj7Q1DEpWNkzgXTDzxo3ZYWFKlq6cVvw2eR - vP+uv56/AehVvkSccelEAAAAAElFTkSuQmCC diff --git a/OpenRA.Editor/OpenRA.Editor.csproj b/OpenRA.Editor/OpenRA.Editor.csproj index 54b082ca74..294815d6af 100644 --- a/OpenRA.Editor/OpenRA.Editor.csproj +++ b/OpenRA.Editor/OpenRA.Editor.csproj @@ -1,4 +1,4 @@ - + Debug @@ -76,12 +76,6 @@ NewMapDialog.cs - - Form - - - PaletteBox.cs - Form @@ -99,9 +93,6 @@ NewMapDialog.cs - - PaletteBox.cs - PropertiesDialog.cs