diff --git a/Source/BuilderModes/General/BuilderPlug.cs b/Source/BuilderModes/General/BuilderPlug.cs index eeed49f4..0a4bb62f 100644 --- a/Source/BuilderModes/General/BuilderPlug.cs +++ b/Source/BuilderModes/General/BuilderPlug.cs @@ -134,7 +134,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // When ceiling surface geometry is created for classic modes public override void OnSectorCeilingSurfaceUpdate(Sector s, ref FlatVertex[] vertices) { - ImageData img = General.Map.Data.GetFlatImage(s.LongFloorTexture); + ImageData img = General.Map.Data.GetFlatImage(s.LongCeilTexture); if(img != null) { // Make scalars diff --git a/Source/Data/DataManager.cs b/Source/Data/DataManager.cs index b3a1e691..ab8f2e1d 100644 --- a/Source/Data/DataManager.cs +++ b/Source/Data/DataManager.cs @@ -70,6 +70,9 @@ namespace CodeImp.DoomBuilder.Data private ImageData missingtexture3d; private ImageData hourglass3d; + // Used images + private Dictionary usedimages; + // Disposing private bool isdisposed = false; @@ -172,6 +175,7 @@ namespace CodeImp.DoomBuilder.Data imageque = new Queue(); previews = new PreviewManager(); texturesets = new List(); + usedimages = new Dictionary(); // Load texture sets foreach(DefinedTextureSet ts in General.Map.ConfigSettings.TextureSets) @@ -413,11 +417,7 @@ namespace CodeImp.DoomBuilder.Data do { // Do we have to update the used-in-map status? - if(updatedusedtextures) - { - BackgroundUpdateUsedTextures(); - updatedusedtextures = false; - } + if(updatedusedtextures) BackgroundUpdateUsedTextures(); // Get next item ImageData image = null; @@ -502,40 +502,28 @@ namespace CodeImp.DoomBuilder.Data // This updates the used-in-map status on all textures and flats private void BackgroundUpdateUsedTextures() { - Dictionary useditems = new Dictionary(); - - // TODO: Move the map scanning part to the application thread (into the - // UpdateUsedTextures function) - // We shouldn't do this in the background, because we're not supposed - // to access the map from this thread! The map could change! - - // Go through the map to find the used textures - foreach(Sidedef sd in General.Map.Map.Sidedefs) + lock(usedimages) { - // Add used textures to dictionary - if(sd.HighTexture.Length > 0) useditems[sd.LongHighTexture] = 0; - if(sd.LowTexture.Length > 0) useditems[sd.LongMiddleTexture] = 0; - if(sd.MiddleTexture.Length > 0) useditems[sd.LongLowTexture] = 0; - } + // Set used on all textures + foreach(KeyValuePair i in textures) + { + i.Value.SetUsedInMap(usedimages.ContainsKey(i.Key)); + if(i.Value.IsImageLoaded != i.Value.IsReferenced) ProcessImage(i.Value); + } - // Go through the map to find the used flats - foreach(Sector s in General.Map.Map.Sectors) - { - // Add used flats to dictionary - useditems[s.LongFloorTexture] = 0; - useditems[s.LongCeilTexture] = 0; - } + // Flats are not already included with the textures? + if(!General.Map.Config.MixTexturesFlats) + { + // Set used on all flats + foreach(KeyValuePair i in flats) + { + i.Value.SetUsedInMap(usedimages.ContainsKey(i.Key)); + if(i.Value.IsImageLoaded != i.Value.IsReferenced) ProcessImage(i.Value); + } + } - // Set used on all textures - foreach(KeyValuePair i in textures) - i.Value.SetUsedInMap(useditems.ContainsKey(i.Key)); - - // Flats are not already included with the textures? - if(!General.Map.Config.MixTexturesFlats) - { - // Set used on all flats - foreach(KeyValuePair i in flats) - i.Value.SetUsedInMap(useditems.ContainsKey(i.Key)); + // Done + updatedusedtextures = false; } } @@ -966,7 +954,30 @@ namespace CodeImp.DoomBuilder.Data // used-in-map status on all textures and flats public void UpdateUsedTextures() { - updatedusedtextures = true; + lock(usedimages) + { + usedimages.Clear(); + + // Go through the map to find the used textures + foreach(Sidedef sd in General.Map.Map.Sidedefs) + { + // Add used textures to dictionary + if(sd.HighTexture.Length > 0) usedimages[sd.LongHighTexture] = 0; + if(sd.LowTexture.Length > 0) usedimages[sd.LongMiddleTexture] = 0; + if(sd.MiddleTexture.Length > 0) usedimages[sd.LongLowTexture] = 0; + } + + // Go through the map to find the used flats + foreach(Sector s in General.Map.Map.Sectors) + { + // Add used flats to dictionary + usedimages[s.LongFloorTexture] = 0; + usedimages[s.LongCeilTexture] = 0; + } + + // Notify the background thread that it needs to update the images + updatedusedtextures = true; + } } #endregion diff --git a/Source/Windows/MainForm.Designer.cs b/Source/Windows/MainForm.Designer.cs index 926d65b2..8071f11a 100644 --- a/Source/Windows/MainForm.Designer.cs +++ b/Source/Windows/MainForm.Designer.cs @@ -49,17 +49,30 @@ namespace CodeImp.DoomBuilder.Windows this.poscommalabel = new System.Windows.Forms.ToolStripStatusLabel(); this.menumain = new System.Windows.Forms.MenuStrip(); this.menufile = new System.Windows.Forms.ToolStripMenuItem(); + this.itemnewmap = new System.Windows.Forms.ToolStripMenuItem(); + this.itemopenmap = new System.Windows.Forms.ToolStripMenuItem(); this.itemclosemap = new System.Windows.Forms.ToolStripMenuItem(); + this.itemsavemap = new System.Windows.Forms.ToolStripMenuItem(); this.itemsavemapas = new System.Windows.Forms.ToolStripMenuItem(); this.itemsavemapinto = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); + this.itemtestmap = new System.Windows.Forms.ToolStripMenuItem(); this.itemnorecent = new System.Windows.Forms.ToolStripMenuItem(); this.itemexit = new System.Windows.Forms.ToolStripMenuItem(); this.menuedit = new System.Windows.Forms.ToolStripMenuItem(); + this.itemundo = new System.Windows.Forms.ToolStripMenuItem(); + this.itemredo = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator(); + this.itemcut = new System.Windows.Forms.ToolStripMenuItem(); + this.itemcopy = new System.Windows.Forms.ToolStripMenuItem(); + this.itempaste = new System.Windows.Forms.ToolStripMenuItem(); + this.itemsnaptogrid = new System.Windows.Forms.ToolStripMenuItem(); + this.itemautomerge = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator(); this.itemgridinc = new System.Windows.Forms.ToolStripMenuItem(); this.itemgriddec = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgridsetup = new System.Windows.Forms.ToolStripMenuItem(); + this.itemmapoptions = new System.Windows.Forms.ToolStripMenuItem(); this.menumode = new System.Windows.Forms.ToolStripMenuItem(); this.menutools = new System.Windows.Forms.ToolStripMenuItem(); this.itemreloadresources = new System.Windows.Forms.ToolStripMenuItem(); @@ -68,14 +81,52 @@ namespace CodeImp.DoomBuilder.Windows this.menuhelp = new System.Windows.Forms.ToolStripMenuItem(); this.itemhelpabout = new System.Windows.Forms.ToolStripMenuItem(); this.toolbar = new System.Windows.Forms.ToolStrip(); + this.buttonnewmap = new System.Windows.Forms.ToolStripButton(); + this.buttonopenmap = new System.Windows.Forms.ToolStripButton(); + this.buttonsavemap = new System.Windows.Forms.ToolStripButton(); + this.buttonmapoptions = new System.Windows.Forms.ToolStripButton(); + this.buttonundo = new System.Windows.Forms.ToolStripButton(); + this.buttonredo = new System.Windows.Forms.ToolStripButton(); + this.buttoncut = new System.Windows.Forms.ToolStripButton(); + this.buttoncopy = new System.Windows.Forms.ToolStripButton(); + this.buttonpaste = new System.Windows.Forms.ToolStripButton(); + this.buttonthingsfilter = new System.Windows.Forms.ToolStripButton(); this.thingfilters = new System.Windows.Forms.ToolStripComboBox(); + this.buttonviewnormal = new System.Windows.Forms.ToolStripButton(); + this.buttonviewbrightness = new System.Windows.Forms.ToolStripButton(); + this.buttonviewfloors = new System.Windows.Forms.ToolStripButton(); + this.buttonviewceilings = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.buttonsnaptogrid = new System.Windows.Forms.ToolStripButton(); + this.buttonautomerge = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.buttontestmonsters = new System.Windows.Forms.ToolStripButton(); + this.buttontest = new System.Windows.Forms.ToolStripSplitButton(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.statusbar = new System.Windows.Forms.StatusStrip(); + this.statuslabel = new System.Windows.Forms.ToolStripStatusLabel(); this.configlabel = new System.Windows.Forms.ToolStripStatusLabel(); this.gridlabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.buttongrid = new System.Windows.Forms.ToolStripDropDownButton(); + this.itemgrid1024 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid512 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid256 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid128 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid64 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid32 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid16 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid8 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid4 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgridcustom = new System.Windows.Forms.ToolStripMenuItem(); this.zoomlabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.buttonzoom = new System.Windows.Forms.ToolStripDropDownButton(); + this.itemzoom200 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoom100 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoom50 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoom25 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoom10 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoom5 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoomfittoscreen = new System.Windows.Forms.ToolStripMenuItem(); this.xposlabel = new System.Windows.Forms.ToolStripStatusLabel(); this.yposlabel = new System.Windows.Forms.ToolStripStatusLabel(); this.panelinfo = new System.Windows.Forms.Panel(); @@ -89,57 +140,6 @@ namespace CodeImp.DoomBuilder.Windows this.processor = new System.Windows.Forms.Timer(this.components); this.warningtimer = new System.Windows.Forms.Timer(this.components); this.warningflasher = new System.Windows.Forms.Timer(this.components); - this.statuslabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.buttongrid = new System.Windows.Forms.ToolStripDropDownButton(); - this.itemgrid1024 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid512 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid256 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid128 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid64 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid32 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid16 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid8 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid4 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgridcustom = new System.Windows.Forms.ToolStripMenuItem(); - this.buttonzoom = new System.Windows.Forms.ToolStripDropDownButton(); - this.itemzoom200 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoom100 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoom50 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoom25 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoom10 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoom5 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoomfittoscreen = new System.Windows.Forms.ToolStripMenuItem(); - this.buttonnewmap = new System.Windows.Forms.ToolStripButton(); - this.buttonopenmap = new System.Windows.Forms.ToolStripButton(); - this.buttonsavemap = new System.Windows.Forms.ToolStripButton(); - this.buttonmapoptions = new System.Windows.Forms.ToolStripButton(); - this.buttonundo = new System.Windows.Forms.ToolStripButton(); - this.buttonredo = new System.Windows.Forms.ToolStripButton(); - this.buttoncut = new System.Windows.Forms.ToolStripButton(); - this.buttoncopy = new System.Windows.Forms.ToolStripButton(); - this.buttonpaste = new System.Windows.Forms.ToolStripButton(); - this.buttonthingsfilter = new System.Windows.Forms.ToolStripButton(); - this.buttonviewnormal = new System.Windows.Forms.ToolStripButton(); - this.buttonviewbrightness = new System.Windows.Forms.ToolStripButton(); - this.buttonviewfloors = new System.Windows.Forms.ToolStripButton(); - this.buttonviewceilings = new System.Windows.Forms.ToolStripButton(); - this.buttonsnaptogrid = new System.Windows.Forms.ToolStripButton(); - this.buttonautomerge = new System.Windows.Forms.ToolStripButton(); - this.buttontestmonsters = new System.Windows.Forms.ToolStripButton(); - this.buttontest = new System.Windows.Forms.ToolStripSplitButton(); - this.itemnewmap = new System.Windows.Forms.ToolStripMenuItem(); - this.itemopenmap = new System.Windows.Forms.ToolStripMenuItem(); - this.itemsavemap = new System.Windows.Forms.ToolStripMenuItem(); - this.itemtestmap = new System.Windows.Forms.ToolStripMenuItem(); - this.itemundo = new System.Windows.Forms.ToolStripMenuItem(); - this.itemredo = new System.Windows.Forms.ToolStripMenuItem(); - this.itemcut = new System.Windows.Forms.ToolStripMenuItem(); - this.itemcopy = new System.Windows.Forms.ToolStripMenuItem(); - this.itempaste = new System.Windows.Forms.ToolStripMenuItem(); - this.itemsnaptogrid = new System.Windows.Forms.ToolStripMenuItem(); - this.itemautomerge = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgridsetup = new System.Windows.Forms.ToolStripMenuItem(); - this.itemmapoptions = new System.Windows.Forms.ToolStripMenuItem(); toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); @@ -233,6 +233,16 @@ namespace CodeImp.DoomBuilder.Windows toolStripSeparator12.Name = "toolStripSeparator12"; toolStripSeparator12.Size = new System.Drawing.Size(6, 23); // + // toolStripMenuItem4 + // + toolStripMenuItem4.Name = "toolStripMenuItem4"; + toolStripMenuItem4.Size = new System.Drawing.Size(161, 6); + // + // toolStripSeparator2 + // + toolStripSeparator2.Name = "toolStripSeparator2"; + toolStripSeparator2.Size = new System.Drawing.Size(164, 6); + // // buttoneditmodesseperator // this.buttoneditmodesseperator.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); @@ -279,6 +289,25 @@ namespace CodeImp.DoomBuilder.Windows this.menufile.Size = new System.Drawing.Size(35, 20); this.menufile.Text = "File"; // + // itemnewmap + // + this.itemnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.File; + this.itemnewmap.Name = "itemnewmap"; + this.itemnewmap.ShortcutKeyDisplayString = ""; + this.itemnewmap.Size = new System.Drawing.Size(201, 22); + this.itemnewmap.Tag = "builder_newmap"; + this.itemnewmap.Text = "New Map"; + this.itemnewmap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemopenmap + // + this.itemopenmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap; + this.itemopenmap.Name = "itemopenmap"; + this.itemopenmap.Size = new System.Drawing.Size(201, 22); + this.itemopenmap.Tag = "builder_openmap"; + this.itemopenmap.Text = "Open Map..."; + this.itemopenmap.Click += new System.EventHandler(this.InvokeTaggedAction); + // // itemclosemap // this.itemclosemap.Name = "itemclosemap"; @@ -287,6 +316,15 @@ namespace CodeImp.DoomBuilder.Windows this.itemclosemap.Text = "Close Map"; this.itemclosemap.Click += new System.EventHandler(this.InvokeTaggedAction); // + // itemsavemap + // + this.itemsavemap.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveMap; + this.itemsavemap.Name = "itemsavemap"; + this.itemsavemap.Size = new System.Drawing.Size(201, 22); + this.itemsavemap.Tag = "builder_savemap"; + this.itemsavemap.Text = "Save Map"; + this.itemsavemap.Click += new System.EventHandler(this.InvokeTaggedAction); + // // itemsavemapas // this.itemsavemapas.Name = "itemsavemapas"; @@ -308,6 +346,15 @@ namespace CodeImp.DoomBuilder.Windows this.toolStripMenuItem5.Name = "toolStripMenuItem5"; this.toolStripMenuItem5.Size = new System.Drawing.Size(198, 6); // + // itemtestmap + // + this.itemtestmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.Test; + this.itemtestmap.Name = "itemtestmap"; + this.itemtestmap.Size = new System.Drawing.Size(201, 22); + this.itemtestmap.Tag = "builder_testmap"; + this.itemtestmap.Text = "Test Map"; + this.itemtestmap.Click += new System.EventHandler(this.InvokeTaggedAction); + // // itemnorecent // this.itemnorecent.Enabled = false; @@ -344,11 +391,78 @@ namespace CodeImp.DoomBuilder.Windows this.menuedit.Size = new System.Drawing.Size(37, 20); this.menuedit.Text = "Edit"; // + // itemundo + // + this.itemundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo; + this.itemundo.Name = "itemundo"; + this.itemundo.Size = new System.Drawing.Size(165, 22); + this.itemundo.Tag = "builder_undo"; + this.itemundo.Text = "Undo"; + this.itemundo.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemredo + // + this.itemredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo; + this.itemredo.Name = "itemredo"; + this.itemredo.Size = new System.Drawing.Size(165, 22); + this.itemredo.Tag = "builder_redo"; + this.itemredo.Text = "Redo"; + this.itemredo.Click += new System.EventHandler(this.InvokeTaggedAction); + // // toolStripMenuItem7 // this.toolStripMenuItem7.Name = "toolStripMenuItem7"; this.toolStripMenuItem7.Size = new System.Drawing.Size(162, 6); // + // itemcut + // + this.itemcut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut; + this.itemcut.Name = "itemcut"; + this.itemcut.Size = new System.Drawing.Size(165, 22); + this.itemcut.Tag = "builder_cutselection"; + this.itemcut.Text = "Cut"; + this.itemcut.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemcopy + // + this.itemcopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy; + this.itemcopy.Name = "itemcopy"; + this.itemcopy.Size = new System.Drawing.Size(165, 22); + this.itemcopy.Tag = "builder_copyselection"; + this.itemcopy.Text = "Copy"; + this.itemcopy.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itempaste + // + this.itempaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste; + this.itempaste.Name = "itempaste"; + this.itempaste.Size = new System.Drawing.Size(165, 22); + this.itempaste.Tag = "builder_pasteselection"; + this.itempaste.Text = "Paste"; + this.itempaste.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemsnaptogrid + // + this.itemsnaptogrid.Checked = true; + this.itemsnaptogrid.CheckState = System.Windows.Forms.CheckState.Checked; + this.itemsnaptogrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid4; + this.itemsnaptogrid.Name = "itemsnaptogrid"; + this.itemsnaptogrid.Size = new System.Drawing.Size(165, 22); + this.itemsnaptogrid.Tag = "builder_togglesnap"; + this.itemsnaptogrid.Text = "Snap to Grid"; + this.itemsnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemautomerge + // + this.itemautomerge.Checked = true; + this.itemautomerge.CheckState = System.Windows.Forms.CheckState.Checked; + this.itemautomerge.Image = global::CodeImp.DoomBuilder.Properties.Resources.mergegeometry2; + this.itemautomerge.Name = "itemautomerge"; + this.itemautomerge.Size = new System.Drawing.Size(165, 22); + this.itemautomerge.Tag = "builder_toggleautomerge"; + this.itemautomerge.Text = "Merge Geometry"; + this.itemautomerge.Click += new System.EventHandler(this.InvokeTaggedAction); + // // toolStripMenuItem6 // this.toolStripMenuItem6.Name = "toolStripMenuItem6"; @@ -370,6 +484,24 @@ namespace CodeImp.DoomBuilder.Windows this.itemgriddec.Text = "Decrease Grid"; this.itemgriddec.Click += new System.EventHandler(this.InvokeTaggedAction); // + // itemgridsetup + // + this.itemgridsetup.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2; + this.itemgridsetup.Name = "itemgridsetup"; + this.itemgridsetup.Size = new System.Drawing.Size(165, 22); + this.itemgridsetup.Tag = "builder_gridsetup"; + this.itemgridsetup.Text = "Grid Setup..."; + this.itemgridsetup.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemmapoptions + // + this.itemmapoptions.Image = global::CodeImp.DoomBuilder.Properties.Resources.Properties; + this.itemmapoptions.Name = "itemmapoptions"; + this.itemmapoptions.Size = new System.Drawing.Size(165, 22); + this.itemmapoptions.Tag = "builder_mapoptions"; + this.itemmapoptions.Text = "Map Options...."; + this.itemmapoptions.Click += new System.EventHandler(this.InvokeTaggedAction); + // // menumode // this.menumode.Name = "menumode"; @@ -462,6 +594,117 @@ namespace CodeImp.DoomBuilder.Windows this.toolbar.Size = new System.Drawing.Size(1012, 25); this.toolbar.TabIndex = 1; // + // buttonnewmap + // + this.buttonnewmap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.NewMap; + this.buttonnewmap.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonnewmap.Name = "buttonnewmap"; + this.buttonnewmap.Size = new System.Drawing.Size(23, 22); + this.buttonnewmap.Tag = "builder_newmap"; + this.buttonnewmap.Text = "New Map"; + this.buttonnewmap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonopenmap + // + this.buttonopenmap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonopenmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap; + this.buttonopenmap.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonopenmap.Name = "buttonopenmap"; + this.buttonopenmap.Size = new System.Drawing.Size(23, 22); + this.buttonopenmap.Tag = "builder_openmap"; + this.buttonopenmap.Text = "Open Map"; + this.buttonopenmap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonsavemap + // + this.buttonsavemap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonsavemap.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveMap; + this.buttonsavemap.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonsavemap.Name = "buttonsavemap"; + this.buttonsavemap.Size = new System.Drawing.Size(23, 22); + this.buttonsavemap.Tag = "builder_savemap"; + this.buttonsavemap.Text = "Save Map"; + this.buttonsavemap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonmapoptions + // + this.buttonmapoptions.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonmapoptions.Image = global::CodeImp.DoomBuilder.Properties.Resources.Properties; + this.buttonmapoptions.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonmapoptions.Name = "buttonmapoptions"; + this.buttonmapoptions.Size = new System.Drawing.Size(23, 22); + this.buttonmapoptions.Tag = "builder_mapoptions"; + this.buttonmapoptions.Text = "Map Options"; + this.buttonmapoptions.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonundo + // + this.buttonundo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo; + this.buttonundo.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonundo.Name = "buttonundo"; + this.buttonundo.Size = new System.Drawing.Size(23, 22); + this.buttonundo.Tag = "builder_undo"; + this.buttonundo.Text = "Undo"; + this.buttonundo.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonredo + // + this.buttonredo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo; + this.buttonredo.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonredo.Name = "buttonredo"; + this.buttonredo.Size = new System.Drawing.Size(23, 22); + this.buttonredo.Tag = "builder_redo"; + this.buttonredo.Text = "Redo"; + this.buttonredo.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttoncut + // + this.buttoncut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttoncut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut; + this.buttoncut.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttoncut.Name = "buttoncut"; + this.buttoncut.Size = new System.Drawing.Size(23, 22); + this.buttoncut.Tag = "builder_cutselection"; + this.buttoncut.Text = "Cut Selection"; + this.buttoncut.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttoncopy + // + this.buttoncopy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttoncopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy; + this.buttoncopy.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttoncopy.Name = "buttoncopy"; + this.buttoncopy.Size = new System.Drawing.Size(23, 22); + this.buttoncopy.Tag = "builder_copyselection"; + this.buttoncopy.Text = "Copy Selection"; + this.buttoncopy.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonpaste + // + this.buttonpaste.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonpaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste; + this.buttonpaste.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonpaste.Name = "buttonpaste"; + this.buttonpaste.Size = new System.Drawing.Size(23, 22); + this.buttonpaste.Tag = "builder_pasteselection"; + this.buttonpaste.Text = "Paste Selection"; + this.buttonpaste.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonthingsfilter + // + this.buttonthingsfilter.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonthingsfilter.Enabled = false; + this.buttonthingsfilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.Filter; + this.buttonthingsfilter.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonthingsfilter.Name = "buttonthingsfilter"; + this.buttonthingsfilter.Size = new System.Drawing.Size(23, 22); + this.buttonthingsfilter.Tag = "builder_thingsfilterssetup"; + this.buttonthingsfilter.Text = "Configure Things Filters"; + this.buttonthingsfilter.Click += new System.EventHandler(this.InvokeTaggedAction); + // // thingfilters // this.thingfilters.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -479,18 +722,117 @@ namespace CodeImp.DoomBuilder.Windows this.thingfilters.SelectedIndexChanged += new System.EventHandler(this.thingfilters_SelectedIndexChanged); this.thingfilters.DropDownClosed += new System.EventHandler(this.LoseFocus); // + // buttonviewnormal + // + this.buttonviewnormal.CheckOnClick = true; + this.buttonviewnormal.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonviewnormal.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewNormal; + this.buttonviewnormal.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonviewnormal.Name = "buttonviewnormal"; + this.buttonviewnormal.Size = new System.Drawing.Size(23, 22); + this.buttonviewnormal.Tag = "0"; + this.buttonviewnormal.Text = "View Wireframe"; + this.buttonviewnormal.Click += new System.EventHandler(this.ViewModeButtonClick); + // + // buttonviewbrightness + // + this.buttonviewbrightness.CheckOnClick = true; + this.buttonviewbrightness.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonviewbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewBrightness; + this.buttonviewbrightness.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonviewbrightness.Name = "buttonviewbrightness"; + this.buttonviewbrightness.Size = new System.Drawing.Size(23, 22); + this.buttonviewbrightness.Tag = "1"; + this.buttonviewbrightness.Text = "View Brightness Levels"; + this.buttonviewbrightness.Click += new System.EventHandler(this.ViewModeButtonClick); + // + // buttonviewfloors + // + this.buttonviewfloors.CheckOnClick = true; + this.buttonviewfloors.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonviewfloors.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureFloor; + this.buttonviewfloors.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonviewfloors.Name = "buttonviewfloors"; + this.buttonviewfloors.Size = new System.Drawing.Size(23, 22); + this.buttonviewfloors.Tag = "2"; + this.buttonviewfloors.Text = "View Floor Textures"; + this.buttonviewfloors.Click += new System.EventHandler(this.ViewModeButtonClick); + // + // buttonviewceilings + // + this.buttonviewceilings.CheckOnClick = true; + this.buttonviewceilings.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonviewceilings.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureCeiling; + this.buttonviewceilings.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonviewceilings.Name = "buttonviewceilings"; + this.buttonviewceilings.Size = new System.Drawing.Size(23, 22); + this.buttonviewceilings.Tag = "3"; + this.buttonviewceilings.Text = "View Ceiling Textures"; + this.buttonviewceilings.Click += new System.EventHandler(this.ViewModeButtonClick); + // // toolStripSeparator8 // this.toolStripSeparator8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.toolStripSeparator8.Name = "toolStripSeparator8"; this.toolStripSeparator8.Size = new System.Drawing.Size(6, 25); // + // buttonsnaptogrid + // + this.buttonsnaptogrid.Checked = true; + this.buttonsnaptogrid.CheckState = System.Windows.Forms.CheckState.Checked; + this.buttonsnaptogrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonsnaptogrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid4; + this.buttonsnaptogrid.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonsnaptogrid.Name = "buttonsnaptogrid"; + this.buttonsnaptogrid.Size = new System.Drawing.Size(23, 22); + this.buttonsnaptogrid.Tag = "builder_togglesnap"; + this.buttonsnaptogrid.Text = "Snap to Grid"; + this.buttonsnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonautomerge + // + this.buttonautomerge.Checked = true; + this.buttonautomerge.CheckState = System.Windows.Forms.CheckState.Checked; + this.buttonautomerge.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonautomerge.Image = global::CodeImp.DoomBuilder.Properties.Resources.mergegeometry2; + this.buttonautomerge.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonautomerge.Name = "buttonautomerge"; + this.buttonautomerge.Size = new System.Drawing.Size(23, 22); + this.buttonautomerge.Tag = "builder_toggleautomerge"; + this.buttonautomerge.Text = "Merge Geometry"; + this.buttonautomerge.Click += new System.EventHandler(this.InvokeTaggedAction); + // // toolStripSeparator5 // this.toolStripSeparator5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); // + // buttontestmonsters + // + this.buttontestmonsters.Checked = true; + this.buttontestmonsters.CheckState = System.Windows.Forms.CheckState.Checked; + this.buttontestmonsters.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttontestmonsters.Image = global::CodeImp.DoomBuilder.Properties.Resources.Monster2; + this.buttontestmonsters.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.buttontestmonsters.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttontestmonsters.Name = "buttontestmonsters"; + this.buttontestmonsters.Size = new System.Drawing.Size(23, 22); + this.buttontestmonsters.Text = "Test with monsters"; + this.buttontestmonsters.Click += new System.EventHandler(this.buttontestmonsters_Click); + // + // buttontest + // + this.buttontest.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttontest.Image = global::CodeImp.DoomBuilder.Properties.Resources.Test; + this.buttontest.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.buttontest.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttontest.Name = "buttontest"; + this.buttontest.Size = new System.Drawing.Size(32, 22); + this.buttontest.Tag = "builder_testmap"; + this.buttontest.Text = "Test Map"; + this.buttontest.ButtonClick += new System.EventHandler(this.InvokeTaggedAction); + // // toolStripSeparator6 // this.toolStripSeparator6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); @@ -519,6 +861,17 @@ namespace CodeImp.DoomBuilder.Windows this.statusbar.Size = new System.Drawing.Size(1012, 23); this.statusbar.TabIndex = 2; // + // statuslabel + // + this.statuslabel.Image = global::CodeImp.DoomBuilder.Properties.Resources.Status2; + this.statuslabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.statuslabel.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.statuslabel.Name = "statuslabel"; + this.statuslabel.Size = new System.Drawing.Size(396, 18); + this.statuslabel.Spring = true; + this.statuslabel.Text = "Initializing user interface..."; + this.statuslabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // configlabel // this.configlabel.AutoSize = false; @@ -540,6 +893,109 @@ namespace CodeImp.DoomBuilder.Windows this.gridlabel.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay; this.gridlabel.ToolTipText = "Grid size"; // + // buttongrid + // + this.buttongrid.AutoToolTip = false; + this.buttongrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttongrid.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.itemgrid1024, + this.itemgrid512, + this.itemgrid256, + this.itemgrid128, + this.itemgrid64, + this.itemgrid32, + this.itemgrid16, + this.itemgrid8, + this.itemgrid4, + toolStripMenuItem4, + this.itemgridcustom}); + this.buttongrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2_arrowup; + this.buttongrid.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.buttongrid.ImageTransparentColor = System.Drawing.Color.Transparent; + this.buttongrid.Name = "buttongrid"; + this.buttongrid.ShowDropDownArrow = false; + this.buttongrid.Size = new System.Drawing.Size(29, 21); + this.buttongrid.Text = "Grid"; + // + // itemgrid1024 + // + this.itemgrid1024.Name = "itemgrid1024"; + this.itemgrid1024.Size = new System.Drawing.Size(164, 22); + this.itemgrid1024.Tag = "1024"; + this.itemgrid1024.Text = "1024 mp"; + this.itemgrid1024.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid512 + // + this.itemgrid512.Name = "itemgrid512"; + this.itemgrid512.Size = new System.Drawing.Size(164, 22); + this.itemgrid512.Tag = "512"; + this.itemgrid512.Text = "512 mp"; + this.itemgrid512.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid256 + // + this.itemgrid256.Name = "itemgrid256"; + this.itemgrid256.Size = new System.Drawing.Size(164, 22); + this.itemgrid256.Tag = "256"; + this.itemgrid256.Text = "256 mp"; + this.itemgrid256.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid128 + // + this.itemgrid128.Name = "itemgrid128"; + this.itemgrid128.Size = new System.Drawing.Size(164, 22); + this.itemgrid128.Tag = "128"; + this.itemgrid128.Text = "128 mp"; + this.itemgrid128.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid64 + // + this.itemgrid64.Name = "itemgrid64"; + this.itemgrid64.Size = new System.Drawing.Size(164, 22); + this.itemgrid64.Tag = "64"; + this.itemgrid64.Text = "64 mp"; + this.itemgrid64.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid32 + // + this.itemgrid32.Name = "itemgrid32"; + this.itemgrid32.Size = new System.Drawing.Size(164, 22); + this.itemgrid32.Tag = "32"; + this.itemgrid32.Text = "32 mp"; + this.itemgrid32.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid16 + // + this.itemgrid16.Name = "itemgrid16"; + this.itemgrid16.Size = new System.Drawing.Size(164, 22); + this.itemgrid16.Tag = "16"; + this.itemgrid16.Text = "16 mp"; + this.itemgrid16.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid8 + // + this.itemgrid8.Name = "itemgrid8"; + this.itemgrid8.Size = new System.Drawing.Size(164, 22); + this.itemgrid8.Tag = "8"; + this.itemgrid8.Text = "8 mp"; + this.itemgrid8.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid4 + // + this.itemgrid4.Name = "itemgrid4"; + this.itemgrid4.Size = new System.Drawing.Size(164, 22); + this.itemgrid4.Tag = "4"; + this.itemgrid4.Text = "4 mp"; + this.itemgrid4.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgridcustom + // + this.itemgridcustom.Name = "itemgridcustom"; + this.itemgridcustom.Size = new System.Drawing.Size(164, 22); + this.itemgridcustom.Text = "Customize..."; + this.itemgridcustom.Click += new System.EventHandler(this.itemgridcustom_Click); + // // zoomlabel // this.zoomlabel.AutoSize = false; @@ -551,6 +1007,82 @@ namespace CodeImp.DoomBuilder.Windows this.zoomlabel.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay; this.zoomlabel.ToolTipText = "Zoom level"; // + // buttonzoom + // + this.buttonzoom.AutoToolTip = false; + this.buttonzoom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonzoom.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.itemzoom200, + this.itemzoom100, + this.itemzoom50, + this.itemzoom25, + this.itemzoom10, + this.itemzoom5, + toolStripSeparator2, + this.itemzoomfittoscreen}); + this.buttonzoom.Image = global::CodeImp.DoomBuilder.Properties.Resources.Zoom_arrowup; + this.buttonzoom.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.buttonzoom.ImageTransparentColor = System.Drawing.Color.Transparent; + this.buttonzoom.Name = "buttonzoom"; + this.buttonzoom.ShowDropDownArrow = false; + this.buttonzoom.Size = new System.Drawing.Size(29, 21); + this.buttonzoom.Text = "Zoom"; + // + // itemzoom200 + // + this.itemzoom200.Name = "itemzoom200"; + this.itemzoom200.Size = new System.Drawing.Size(167, 22); + this.itemzoom200.Tag = "200"; + this.itemzoom200.Text = "200%"; + this.itemzoom200.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoom100 + // + this.itemzoom100.Name = "itemzoom100"; + this.itemzoom100.Size = new System.Drawing.Size(167, 22); + this.itemzoom100.Tag = "100"; + this.itemzoom100.Text = "100%"; + this.itemzoom100.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoom50 + // + this.itemzoom50.Name = "itemzoom50"; + this.itemzoom50.Size = new System.Drawing.Size(167, 22); + this.itemzoom50.Tag = "50"; + this.itemzoom50.Text = "50%"; + this.itemzoom50.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoom25 + // + this.itemzoom25.Name = "itemzoom25"; + this.itemzoom25.Size = new System.Drawing.Size(167, 22); + this.itemzoom25.Tag = "25"; + this.itemzoom25.Text = "25%"; + this.itemzoom25.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoom10 + // + this.itemzoom10.Name = "itemzoom10"; + this.itemzoom10.Size = new System.Drawing.Size(167, 22); + this.itemzoom10.Tag = "10"; + this.itemzoom10.Text = "10%"; + this.itemzoom10.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoom5 + // + this.itemzoom5.Name = "itemzoom5"; + this.itemzoom5.Size = new System.Drawing.Size(167, 22); + this.itemzoom5.Tag = "5"; + this.itemzoom5.Text = "5%"; + this.itemzoom5.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoomfittoscreen + // + this.itemzoomfittoscreen.Name = "itemzoomfittoscreen"; + this.itemzoomfittoscreen.Size = new System.Drawing.Size(167, 22); + this.itemzoomfittoscreen.Text = "Fit to screen"; + this.itemzoomfittoscreen.Click += new System.EventHandler(this.itemzoomfittoscreen_Click); + // // xposlabel // this.xposlabel.AutoSize = false; @@ -677,538 +1209,6 @@ namespace CodeImp.DoomBuilder.Windows // this.warningflasher.Tick += new System.EventHandler(this.warningflasher_Tick); // - // statuslabel - // - this.statuslabel.Image = global::CodeImp.DoomBuilder.Properties.Resources.Status2; - this.statuslabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.statuslabel.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.statuslabel.Name = "statuslabel"; - this.statuslabel.Size = new System.Drawing.Size(201, 16); - this.statuslabel.Spring = true; - this.statuslabel.Text = "Initializing user interface..."; - this.statuslabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // buttongrid - // - this.buttongrid.AutoToolTip = false; - this.buttongrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttongrid.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.itemgrid1024, - this.itemgrid512, - this.itemgrid256, - this.itemgrid128, - this.itemgrid64, - this.itemgrid32, - this.itemgrid16, - this.itemgrid8, - this.itemgrid4, - toolStripMenuItem4, - this.itemgridcustom}); - this.buttongrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2_arrowup; - this.buttongrid.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.buttongrid.ImageTransparentColor = System.Drawing.Color.Transparent; - this.buttongrid.Name = "buttongrid"; - this.buttongrid.ShowDropDownArrow = false; - this.buttongrid.Size = new System.Drawing.Size(29, 20); - this.buttongrid.Text = "Grid"; - // - // itemgrid1024 - // - this.itemgrid1024.Name = "itemgrid1024"; - this.itemgrid1024.Size = new System.Drawing.Size(164, 22); - this.itemgrid1024.Tag = "1024"; - this.itemgrid1024.Text = "1024 mp"; - this.itemgrid1024.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid512 - // - this.itemgrid512.Name = "itemgrid512"; - this.itemgrid512.Size = new System.Drawing.Size(164, 22); - this.itemgrid512.Tag = "512"; - this.itemgrid512.Text = "512 mp"; - this.itemgrid512.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid256 - // - this.itemgrid256.Name = "itemgrid256"; - this.itemgrid256.Size = new System.Drawing.Size(164, 22); - this.itemgrid256.Tag = "256"; - this.itemgrid256.Text = "256 mp"; - this.itemgrid256.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid128 - // - this.itemgrid128.Name = "itemgrid128"; - this.itemgrid128.Size = new System.Drawing.Size(164, 22); - this.itemgrid128.Tag = "128"; - this.itemgrid128.Text = "128 mp"; - this.itemgrid128.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid64 - // - this.itemgrid64.Name = "itemgrid64"; - this.itemgrid64.Size = new System.Drawing.Size(164, 22); - this.itemgrid64.Tag = "64"; - this.itemgrid64.Text = "64 mp"; - this.itemgrid64.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid32 - // - this.itemgrid32.Name = "itemgrid32"; - this.itemgrid32.Size = new System.Drawing.Size(164, 22); - this.itemgrid32.Tag = "32"; - this.itemgrid32.Text = "32 mp"; - this.itemgrid32.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid16 - // - this.itemgrid16.Name = "itemgrid16"; - this.itemgrid16.Size = new System.Drawing.Size(164, 22); - this.itemgrid16.Tag = "16"; - this.itemgrid16.Text = "16 mp"; - this.itemgrid16.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid8 - // - this.itemgrid8.Name = "itemgrid8"; - this.itemgrid8.Size = new System.Drawing.Size(164, 22); - this.itemgrid8.Tag = "8"; - this.itemgrid8.Text = "8 mp"; - this.itemgrid8.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid4 - // - this.itemgrid4.Name = "itemgrid4"; - this.itemgrid4.Size = new System.Drawing.Size(164, 22); - this.itemgrid4.Tag = "4"; - this.itemgrid4.Text = "4 mp"; - this.itemgrid4.Click += new System.EventHandler(this.itemgridsize_Click); - // - // toolStripMenuItem4 - // - toolStripMenuItem4.Name = "toolStripMenuItem4"; - toolStripMenuItem4.Size = new System.Drawing.Size(161, 6); - // - // itemgridcustom - // - this.itemgridcustom.Name = "itemgridcustom"; - this.itemgridcustom.Size = new System.Drawing.Size(164, 22); - this.itemgridcustom.Text = "Customize..."; - this.itemgridcustom.Click += new System.EventHandler(this.itemgridcustom_Click); - // - // buttonzoom - // - this.buttonzoom.AutoToolTip = false; - this.buttonzoom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonzoom.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.itemzoom200, - this.itemzoom100, - this.itemzoom50, - this.itemzoom25, - this.itemzoom10, - this.itemzoom5, - toolStripSeparator2, - this.itemzoomfittoscreen}); - this.buttonzoom.Image = global::CodeImp.DoomBuilder.Properties.Resources.Zoom_arrowup; - this.buttonzoom.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.buttonzoom.ImageTransparentColor = System.Drawing.Color.Transparent; - this.buttonzoom.Name = "buttonzoom"; - this.buttonzoom.ShowDropDownArrow = false; - this.buttonzoom.Size = new System.Drawing.Size(29, 20); - this.buttonzoom.Text = "Zoom"; - // - // itemzoom200 - // - this.itemzoom200.Name = "itemzoom200"; - this.itemzoom200.Size = new System.Drawing.Size(167, 22); - this.itemzoom200.Tag = "200"; - this.itemzoom200.Text = "200%"; - this.itemzoom200.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemzoom100 - // - this.itemzoom100.Name = "itemzoom100"; - this.itemzoom100.Size = new System.Drawing.Size(167, 22); - this.itemzoom100.Tag = "100"; - this.itemzoom100.Text = "100%"; - this.itemzoom100.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemzoom50 - // - this.itemzoom50.Name = "itemzoom50"; - this.itemzoom50.Size = new System.Drawing.Size(167, 22); - this.itemzoom50.Tag = "50"; - this.itemzoom50.Text = "50%"; - this.itemzoom50.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemzoom25 - // - this.itemzoom25.Name = "itemzoom25"; - this.itemzoom25.Size = new System.Drawing.Size(167, 22); - this.itemzoom25.Tag = "25"; - this.itemzoom25.Text = "25%"; - this.itemzoom25.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemzoom10 - // - this.itemzoom10.Name = "itemzoom10"; - this.itemzoom10.Size = new System.Drawing.Size(167, 22); - this.itemzoom10.Tag = "10"; - this.itemzoom10.Text = "10%"; - this.itemzoom10.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemzoom5 - // - this.itemzoom5.Name = "itemzoom5"; - this.itemzoom5.Size = new System.Drawing.Size(167, 22); - this.itemzoom5.Tag = "5"; - this.itemzoom5.Text = "5%"; - this.itemzoom5.Click += new System.EventHandler(this.itemzoomto_Click); - // - // toolStripSeparator2 - // - toolStripSeparator2.Name = "toolStripSeparator2"; - toolStripSeparator2.Size = new System.Drawing.Size(164, 6); - // - // itemzoomfittoscreen - // - this.itemzoomfittoscreen.Name = "itemzoomfittoscreen"; - this.itemzoomfittoscreen.Size = new System.Drawing.Size(167, 22); - this.itemzoomfittoscreen.Text = "Fit to screen"; - this.itemzoomfittoscreen.Click += new System.EventHandler(this.itemzoomfittoscreen_Click); - // - // buttonnewmap - // - this.buttonnewmap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.NewMap; - this.buttonnewmap.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonnewmap.Name = "buttonnewmap"; - this.buttonnewmap.Size = new System.Drawing.Size(23, 22); - this.buttonnewmap.Tag = "builder_newmap"; - this.buttonnewmap.Text = "New Map"; - this.buttonnewmap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonopenmap - // - this.buttonopenmap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonopenmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap; - this.buttonopenmap.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonopenmap.Name = "buttonopenmap"; - this.buttonopenmap.Size = new System.Drawing.Size(23, 22); - this.buttonopenmap.Tag = "builder_openmap"; - this.buttonopenmap.Text = "Open Map"; - this.buttonopenmap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonsavemap - // - this.buttonsavemap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonsavemap.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveMap; - this.buttonsavemap.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonsavemap.Name = "buttonsavemap"; - this.buttonsavemap.Size = new System.Drawing.Size(23, 22); - this.buttonsavemap.Tag = "builder_savemap"; - this.buttonsavemap.Text = "Save Map"; - this.buttonsavemap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonmapoptions - // - this.buttonmapoptions.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonmapoptions.Image = global::CodeImp.DoomBuilder.Properties.Resources.Properties; - this.buttonmapoptions.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonmapoptions.Name = "buttonmapoptions"; - this.buttonmapoptions.Size = new System.Drawing.Size(23, 22); - this.buttonmapoptions.Tag = "builder_mapoptions"; - this.buttonmapoptions.Text = "Map Options"; - this.buttonmapoptions.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonundo - // - this.buttonundo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo; - this.buttonundo.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonundo.Name = "buttonundo"; - this.buttonundo.Size = new System.Drawing.Size(23, 22); - this.buttonundo.Tag = "builder_undo"; - this.buttonundo.Text = "Undo"; - this.buttonundo.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonredo - // - this.buttonredo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo; - this.buttonredo.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonredo.Name = "buttonredo"; - this.buttonredo.Size = new System.Drawing.Size(23, 22); - this.buttonredo.Tag = "builder_redo"; - this.buttonredo.Text = "Redo"; - this.buttonredo.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttoncut - // - this.buttoncut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttoncut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut; - this.buttoncut.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttoncut.Name = "buttoncut"; - this.buttoncut.Size = new System.Drawing.Size(23, 22); - this.buttoncut.Tag = "builder_cutselection"; - this.buttoncut.Text = "Cut Selection"; - this.buttoncut.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttoncopy - // - this.buttoncopy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttoncopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy; - this.buttoncopy.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttoncopy.Name = "buttoncopy"; - this.buttoncopy.Size = new System.Drawing.Size(23, 22); - this.buttoncopy.Tag = "builder_copyselection"; - this.buttoncopy.Text = "Copy Selection"; - this.buttoncopy.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonpaste - // - this.buttonpaste.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonpaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste; - this.buttonpaste.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonpaste.Name = "buttonpaste"; - this.buttonpaste.Size = new System.Drawing.Size(23, 22); - this.buttonpaste.Tag = "builder_pasteselection"; - this.buttonpaste.Text = "Paste Selection"; - this.buttonpaste.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonthingsfilter - // - this.buttonthingsfilter.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonthingsfilter.Enabled = false; - this.buttonthingsfilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.Filter; - this.buttonthingsfilter.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonthingsfilter.Name = "buttonthingsfilter"; - this.buttonthingsfilter.Size = new System.Drawing.Size(23, 22); - this.buttonthingsfilter.Tag = "builder_thingsfilterssetup"; - this.buttonthingsfilter.Text = "Configure Things Filters"; - this.buttonthingsfilter.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonviewnormal - // - this.buttonviewnormal.CheckOnClick = true; - this.buttonviewnormal.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonviewnormal.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewNormal; - this.buttonviewnormal.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonviewnormal.Name = "buttonviewnormal"; - this.buttonviewnormal.Size = new System.Drawing.Size(23, 22); - this.buttonviewnormal.Tag = "0"; - this.buttonviewnormal.Text = "toolStripButton1"; - this.buttonviewnormal.Click += new System.EventHandler(this.ViewModeButtonClick); - // - // buttonviewbrightness - // - this.buttonviewbrightness.CheckOnClick = true; - this.buttonviewbrightness.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonviewbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewBrightness; - this.buttonviewbrightness.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonviewbrightness.Name = "buttonviewbrightness"; - this.buttonviewbrightness.Size = new System.Drawing.Size(23, 22); - this.buttonviewbrightness.Tag = "1"; - this.buttonviewbrightness.Text = "toolStripButton2"; - this.buttonviewbrightness.Click += new System.EventHandler(this.ViewModeButtonClick); - // - // buttonviewfloors - // - this.buttonviewfloors.CheckOnClick = true; - this.buttonviewfloors.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonviewfloors.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureFloor; - this.buttonviewfloors.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonviewfloors.Name = "buttonviewfloors"; - this.buttonviewfloors.Size = new System.Drawing.Size(23, 22); - this.buttonviewfloors.Tag = "2"; - this.buttonviewfloors.Text = "toolStripButton3"; - this.buttonviewfloors.Click += new System.EventHandler(this.ViewModeButtonClick); - // - // buttonviewceilings - // - this.buttonviewceilings.CheckOnClick = true; - this.buttonviewceilings.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonviewceilings.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureCeiling; - this.buttonviewceilings.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonviewceilings.Name = "buttonviewceilings"; - this.buttonviewceilings.Size = new System.Drawing.Size(23, 22); - this.buttonviewceilings.Tag = "3"; - this.buttonviewceilings.Text = "toolStripButton1"; - this.buttonviewceilings.Click += new System.EventHandler(this.ViewModeButtonClick); - // - // buttonsnaptogrid - // - this.buttonsnaptogrid.Checked = true; - this.buttonsnaptogrid.CheckState = System.Windows.Forms.CheckState.Checked; - this.buttonsnaptogrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonsnaptogrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid4; - this.buttonsnaptogrid.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonsnaptogrid.Name = "buttonsnaptogrid"; - this.buttonsnaptogrid.Size = new System.Drawing.Size(23, 22); - this.buttonsnaptogrid.Tag = "builder_togglesnap"; - this.buttonsnaptogrid.Text = "Snap to Grid"; - this.buttonsnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonautomerge - // - this.buttonautomerge.Checked = true; - this.buttonautomerge.CheckState = System.Windows.Forms.CheckState.Checked; - this.buttonautomerge.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonautomerge.Image = global::CodeImp.DoomBuilder.Properties.Resources.mergegeometry2; - this.buttonautomerge.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonautomerge.Name = "buttonautomerge"; - this.buttonautomerge.Size = new System.Drawing.Size(23, 22); - this.buttonautomerge.Tag = "builder_toggleautomerge"; - this.buttonautomerge.Text = "Merge Geometry"; - this.buttonautomerge.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttontestmonsters - // - this.buttontestmonsters.Checked = true; - this.buttontestmonsters.CheckState = System.Windows.Forms.CheckState.Checked; - this.buttontestmonsters.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttontestmonsters.Image = global::CodeImp.DoomBuilder.Properties.Resources.Monster2; - this.buttontestmonsters.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.buttontestmonsters.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttontestmonsters.Name = "buttontestmonsters"; - this.buttontestmonsters.Size = new System.Drawing.Size(23, 22); - this.buttontestmonsters.Text = "Test with monsters"; - this.buttontestmonsters.Click += new System.EventHandler(this.buttontestmonsters_Click); - // - // buttontest - // - this.buttontest.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttontest.Image = global::CodeImp.DoomBuilder.Properties.Resources.Test; - this.buttontest.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.buttontest.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttontest.Name = "buttontest"; - this.buttontest.Size = new System.Drawing.Size(32, 22); - this.buttontest.Tag = "builder_testmap"; - this.buttontest.Text = "Test Map"; - this.buttontest.ButtonClick += new System.EventHandler(this.InvokeTaggedAction); - // - // itemnewmap - // - this.itemnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.File; - this.itemnewmap.Name = "itemnewmap"; - this.itemnewmap.ShortcutKeyDisplayString = ""; - this.itemnewmap.Size = new System.Drawing.Size(201, 22); - this.itemnewmap.Tag = "builder_newmap"; - this.itemnewmap.Text = "New Map"; - this.itemnewmap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemopenmap - // - this.itemopenmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap; - this.itemopenmap.Name = "itemopenmap"; - this.itemopenmap.Size = new System.Drawing.Size(201, 22); - this.itemopenmap.Tag = "builder_openmap"; - this.itemopenmap.Text = "Open Map..."; - this.itemopenmap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemsavemap - // - this.itemsavemap.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveMap; - this.itemsavemap.Name = "itemsavemap"; - this.itemsavemap.Size = new System.Drawing.Size(201, 22); - this.itemsavemap.Tag = "builder_savemap"; - this.itemsavemap.Text = "Save Map"; - this.itemsavemap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemtestmap - // - this.itemtestmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.Test; - this.itemtestmap.Name = "itemtestmap"; - this.itemtestmap.Size = new System.Drawing.Size(201, 22); - this.itemtestmap.Tag = "builder_testmap"; - this.itemtestmap.Text = "Test Map"; - this.itemtestmap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemundo - // - this.itemundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo; - this.itemundo.Name = "itemundo"; - this.itemundo.Size = new System.Drawing.Size(165, 22); - this.itemundo.Tag = "builder_undo"; - this.itemundo.Text = "Undo"; - this.itemundo.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemredo - // - this.itemredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo; - this.itemredo.Name = "itemredo"; - this.itemredo.Size = new System.Drawing.Size(165, 22); - this.itemredo.Tag = "builder_redo"; - this.itemredo.Text = "Redo"; - this.itemredo.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemcut - // - this.itemcut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut; - this.itemcut.Name = "itemcut"; - this.itemcut.Size = new System.Drawing.Size(165, 22); - this.itemcut.Tag = "builder_cutselection"; - this.itemcut.Text = "Cut"; - this.itemcut.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemcopy - // - this.itemcopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy; - this.itemcopy.Name = "itemcopy"; - this.itemcopy.Size = new System.Drawing.Size(165, 22); - this.itemcopy.Tag = "builder_copyselection"; - this.itemcopy.Text = "Copy"; - this.itemcopy.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itempaste - // - this.itempaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste; - this.itempaste.Name = "itempaste"; - this.itempaste.Size = new System.Drawing.Size(165, 22); - this.itempaste.Tag = "builder_pasteselection"; - this.itempaste.Text = "Paste"; - this.itempaste.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemsnaptogrid - // - this.itemsnaptogrid.Checked = true; - this.itemsnaptogrid.CheckState = System.Windows.Forms.CheckState.Checked; - this.itemsnaptogrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid4; - this.itemsnaptogrid.Name = "itemsnaptogrid"; - this.itemsnaptogrid.Size = new System.Drawing.Size(165, 22); - this.itemsnaptogrid.Tag = "builder_togglesnap"; - this.itemsnaptogrid.Text = "Snap to Grid"; - this.itemsnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemautomerge - // - this.itemautomerge.Checked = true; - this.itemautomerge.CheckState = System.Windows.Forms.CheckState.Checked; - this.itemautomerge.Image = global::CodeImp.DoomBuilder.Properties.Resources.mergegeometry2; - this.itemautomerge.Name = "itemautomerge"; - this.itemautomerge.Size = new System.Drawing.Size(165, 22); - this.itemautomerge.Tag = "builder_toggleautomerge"; - this.itemautomerge.Text = "Merge Geometry"; - this.itemautomerge.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemgridsetup - // - this.itemgridsetup.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2; - this.itemgridsetup.Name = "itemgridsetup"; - this.itemgridsetup.Size = new System.Drawing.Size(165, 22); - this.itemgridsetup.Tag = "builder_gridsetup"; - this.itemgridsetup.Text = "Grid Setup..."; - this.itemgridsetup.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemmapoptions - // - this.itemmapoptions.Image = global::CodeImp.DoomBuilder.Properties.Resources.Properties; - this.itemmapoptions.Name = "itemmapoptions"; - this.itemmapoptions.Size = new System.Drawing.Size(165, 22); - this.itemmapoptions.Tag = "builder_mapoptions"; - this.itemmapoptions.Text = "Map Options...."; - this.itemmapoptions.Click += new System.EventHandler(this.InvokeTaggedAction); - // // MainForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/Source/Windows/MainForm.cs b/Source/Windows/MainForm.cs index d7fc6b53..fd7642fe 100644 --- a/Source/Windows/MainForm.cs +++ b/Source/Windows/MainForm.cs @@ -1252,10 +1252,21 @@ namespace CodeImp.DoomBuilder.Windows buttontestmonsters.Enabled = (General.Map != null); buttontestmonsters.Checked = General.Settings.TestMonsters; - // Only disable view mode buttons - if(General.Map == null) + // View mode buttons + for(int i = 0; i < Renderer2D.NUM_VIEW_MODES; i++) { - for(int i = 0; i < Renderer2D.NUM_VIEW_MODES; i++) viewmodes[i].Enabled = false; + // NOTE: We only disable them when no map is loaded, because they may + // need to be disabled for non-classic modes + if(General.Map == null) + { + viewmodes[i].Enabled = false; + viewmodes[i].Checked = false; + } + else + { + // Check the correct button + viewmodes[i].Checked = (i == (int)General.Map.CRenderer2D.ViewMode); + } } } diff --git a/Source/Windows/MainForm.resx b/Source/Windows/MainForm.resx index 14388431..e44b2179 100644 --- a/Source/Windows/MainForm.resx +++ b/Source/Windows/MainForm.resx @@ -156,6 +156,12 @@ False + + False + + + False + True @@ -174,12 +180,6 @@ 207, 17 - - False - - - False - True