From 11151c36cc427ac63526920aa2cca7ab68dd6992 Mon Sep 17 00:00:00 2001
From: codeimp <codeimp@e0d998f2-2e9b-42fe-843d-47128df60a06>
Date: Sun, 18 May 2008 11:56:45 +0000
Subject: [PATCH] - map changed fixes - toolbar buttons fixed

---
 .../ClassicModes/CurveLinedefsMode.cs            |  1 +
 Source/BuilderModes/ClassicModes/LinedefsMode.cs |  4 ++++
 Source/BuilderModes/ClassicModes/SectorsMode.cs  |  5 ++++-
 Source/BuilderModes/ClassicModes/ThingsMode.cs   |  1 +
 Source/BuilderModes/ClassicModes/VerticesMode.cs |  1 +
 Source/Interface/LinedefEditForm.cs              |  1 +
 Source/Interface/MainForm.Designer.cs            | 16 ++++++++--------
 Source/Interface/SectorEditForm.cs               |  1 +
 Source/Interface/ThingEditForm.cs                |  1 +
 9 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Source/BuilderModes/ClassicModes/CurveLinedefsMode.cs b/Source/BuilderModes/ClassicModes/CurveLinedefsMode.cs
index 6a3cfaf9..8d4fab99 100644
--- a/Source/BuilderModes/ClassicModes/CurveLinedefsMode.cs
+++ b/Source/BuilderModes/ClassicModes/CurveLinedefsMode.cs
@@ -157,6 +157,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			
 			// Update caches
 			General.Map.Map.Update();
+			General.Map.IsChanged = true;
 			
 			// Return to base mode
 			General.Map.ChangeMode(basemode);
diff --git a/Source/BuilderModes/ClassicModes/LinedefsMode.cs b/Source/BuilderModes/ClassicModes/LinedefsMode.cs
index 69d4b6ff..b953acd7 100644
--- a/Source/BuilderModes/ClassicModes/LinedefsMode.cs
+++ b/Source/BuilderModes/ClassicModes/LinedefsMode.cs
@@ -431,6 +431,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				foreach(Linedef ld in selected) ld.Dispose();
 				
 				// Update cache values
+				General.Map.IsChanged = true;
 				General.Map.Map.Update();
 
 				// Invoke a new mousemove so that the highlighted item updates
@@ -484,6 +485,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				}
 
 				// Update cache values
+				General.Map.IsChanged = true;
 				General.Map.Map.Update();
 				
 				// Redraw screen
@@ -536,6 +538,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				}
 
 				// Redraw
+				General.Map.IsChanged = true;
 				General.Interface.RedrawDisplay();
 			}
 		}
@@ -560,6 +563,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				}
 
 				// Redraw
+				General.Map.IsChanged = true;
 				General.Interface.RedrawDisplay();
 			}
 		}
diff --git a/Source/BuilderModes/ClassicModes/SectorsMode.cs b/Source/BuilderModes/ClassicModes/SectorsMode.cs
index 97aa7aa3..bd345027 100644
--- a/Source/BuilderModes/ClassicModes/SectorsMode.cs
+++ b/Source/BuilderModes/ClassicModes/SectorsMode.cs
@@ -575,6 +575,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				}
 
 				// Update cache values
+				General.Map.IsChanged = true;
 				General.Map.Map.Update();
 
 				// Redraw screen
@@ -599,7 +600,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				// Deselect
 				General.Map.Map.ClearSelectedSectors();
 				General.Map.Map.ClearSelectedLinedefs();
-				
+				General.Map.IsChanged = true;
+
 				// Redraw display
 				General.Interface.RedrawDisplay();
 			}
@@ -622,6 +624,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				// Deselect
 				General.Map.Map.ClearSelectedSectors();
 				General.Map.Map.ClearSelectedLinedefs();
+				General.Map.IsChanged = true;
 
 				// Redraw display
 				General.Interface.RedrawDisplay();
diff --git a/Source/BuilderModes/ClassicModes/ThingsMode.cs b/Source/BuilderModes/ClassicModes/ThingsMode.cs
index 9f9390a0..078dbc12 100644
--- a/Source/BuilderModes/ClassicModes/ThingsMode.cs
+++ b/Source/BuilderModes/ClassicModes/ThingsMode.cs
@@ -390,6 +390,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				foreach(Thing t in selected) t.Dispose();
 				
 				// Update cache values
+				General.Map.IsChanged = true;
 				General.Map.Map.Update();
 
 				// Invoke a new mousemove so that the highlighted item updates
diff --git a/Source/BuilderModes/ClassicModes/VerticesMode.cs b/Source/BuilderModes/ClassicModes/VerticesMode.cs
index a2a7d5d8..58b0be22 100644
--- a/Source/BuilderModes/ClassicModes/VerticesMode.cs
+++ b/Source/BuilderModes/ClassicModes/VerticesMode.cs
@@ -404,6 +404,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				foreach(Vertex v in selected) v.Dispose();
 
 				// Update cache values
+				General.Map.IsChanged = true;
 				General.Map.Map.Update();
 
 				// Invoke a new mousemove so that the highlighted item updates
diff --git a/Source/Interface/LinedefEditForm.cs b/Source/Interface/LinedefEditForm.cs
index aaf500cb..f079223a 100644
--- a/Source/Interface/LinedefEditForm.cs
+++ b/Source/Interface/LinedefEditForm.cs
@@ -322,6 +322,7 @@ namespace CodeImp.DoomBuilder.Interface
 			}
 
 			// Done
+			General.Map.IsChanged = true;
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}
diff --git a/Source/Interface/MainForm.Designer.cs b/Source/Interface/MainForm.Designer.cs
index 34c16eb1..00b0e085 100644
--- a/Source/Interface/MainForm.Designer.cs
+++ b/Source/Interface/MainForm.Designer.cs
@@ -461,7 +461,7 @@ namespace CodeImp.DoomBuilder.Interface
 			this.buttonnewmap.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.buttonnewmap.Name = "buttonnewmap";
 			this.buttonnewmap.Size = new System.Drawing.Size(23, 22);
-			this.buttonnewmap.Tag = "newmap";
+			this.buttonnewmap.Tag = "builder_newmap";
 			this.buttonnewmap.Text = "New Map";
 			this.buttonnewmap.Click += new System.EventHandler(this.InvokeTaggedAction);
 			// 
@@ -472,7 +472,7 @@ namespace CodeImp.DoomBuilder.Interface
 			this.buttonopenmap.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.buttonopenmap.Name = "buttonopenmap";
 			this.buttonopenmap.Size = new System.Drawing.Size(23, 22);
-			this.buttonopenmap.Tag = "openmap";
+			this.buttonopenmap.Tag = "builder_openmap";
 			this.buttonopenmap.Text = "Open Map";
 			this.buttonopenmap.Click += new System.EventHandler(this.InvokeTaggedAction);
 			// 
@@ -483,7 +483,7 @@ namespace CodeImp.DoomBuilder.Interface
 			this.buttonsavemap.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.buttonsavemap.Name = "buttonsavemap";
 			this.buttonsavemap.Size = new System.Drawing.Size(23, 22);
-			this.buttonsavemap.Tag = "savemap";
+			this.buttonsavemap.Tag = "builder_savemap";
 			this.buttonsavemap.Text = "Save Map";
 			this.buttonsavemap.Click += new System.EventHandler(this.InvokeTaggedAction);
 			// 
@@ -494,7 +494,7 @@ namespace CodeImp.DoomBuilder.Interface
 			this.buttonmapoptions.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.buttonmapoptions.Name = "buttonmapoptions";
 			this.buttonmapoptions.Size = new System.Drawing.Size(23, 22);
-			this.buttonmapoptions.Tag = "mapoptions";
+			this.buttonmapoptions.Tag = "builder_mapoptions";
 			this.buttonmapoptions.Text = "Map Options";
 			this.buttonmapoptions.Click += new System.EventHandler(this.InvokeTaggedAction);
 			// 
@@ -505,7 +505,7 @@ namespace CodeImp.DoomBuilder.Interface
 			this.buttonundo.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.buttonundo.Name = "buttonundo";
 			this.buttonundo.Size = new System.Drawing.Size(23, 22);
-			this.buttonundo.Tag = "undo";
+			this.buttonundo.Tag = "builder_undo";
 			this.buttonundo.Text = "Undo";
 			this.buttonundo.Click += new System.EventHandler(this.InvokeTaggedAction);
 			// 
@@ -516,7 +516,7 @@ namespace CodeImp.DoomBuilder.Interface
 			this.buttonredo.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.buttonredo.Name = "buttonredo";
 			this.buttonredo.Size = new System.Drawing.Size(23, 22);
-			this.buttonredo.Tag = "redo";
+			this.buttonredo.Tag = "builder_redo";
 			this.buttonredo.Text = "Redo";
 			this.buttonredo.Click += new System.EventHandler(this.InvokeTaggedAction);
 			// 
@@ -559,7 +559,7 @@ namespace CodeImp.DoomBuilder.Interface
 			this.buttonsnaptogrid.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.buttonsnaptogrid.Name = "buttonsnaptogrid";
 			this.buttonsnaptogrid.Size = new System.Drawing.Size(23, 22);
-			this.buttonsnaptogrid.Tag = "togglesnap";
+			this.buttonsnaptogrid.Tag = "builder_togglesnap";
 			this.buttonsnaptogrid.Text = "Snap to Grid";
 			this.buttonsnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction);
 			// 
@@ -572,7 +572,7 @@ namespace CodeImp.DoomBuilder.Interface
 			this.buttonautomerge.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.buttonautomerge.Name = "buttonautomerge";
 			this.buttonautomerge.Size = new System.Drawing.Size(23, 22);
-			this.buttonautomerge.Tag = "toggleautomerge";
+			this.buttonautomerge.Tag = "builder_toggleautomerge";
 			this.buttonautomerge.Text = "Merge Geometry";
 			this.buttonautomerge.Click += new System.EventHandler(this.InvokeTaggedAction);
 			// 
diff --git a/Source/Interface/SectorEditForm.cs b/Source/Interface/SectorEditForm.cs
index ff9a5641..c756baa0 100644
--- a/Source/Interface/SectorEditForm.cs
+++ b/Source/Interface/SectorEditForm.cs
@@ -133,6 +133,7 @@ namespace CodeImp.DoomBuilder.Interface
 			}
 
 			// Done
+			General.Map.IsChanged = true;
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}
diff --git a/Source/Interface/ThingEditForm.cs b/Source/Interface/ThingEditForm.cs
index 5b9f63b4..dfff1714 100644
--- a/Source/Interface/ThingEditForm.cs
+++ b/Source/Interface/ThingEditForm.cs
@@ -336,6 +336,7 @@ namespace CodeImp.DoomBuilder.Interface
 			}
 
 			// Done
+			General.Map.IsChanged = true;
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}