better icons for the status bar buttons (arrows now point up)

Source/Builder.csproj

@@ -81,6 +81,7 @@
     <Compile Include="Data\PatchNames.cs" />
     <Compile Include="Data\PK3Reader.cs" />
     <Compile Include="Data\Playpal.cs" />
+    <Compile Include="Data\PreviewManager.cs" />
     <Compile Include="Data\ResourceImage.cs" />
     <Compile Include="Data\SimpleTextureImage.cs" />
     <Compile Include="Data\SpriteImage.cs" />
@@ -598,6 +599,8 @@
     <None Include="Resources\Copy.png" />
     <None Include="Resources\Cut.png" />
     <Content Include="Resources\DB2.ico" />
+    <None Include="Resources\Grid2_arrowup.png" />
+    <None Include="Resources\Zoom_arrowup.png" />
     <None Include="Resources\Paste.png" />
     <None Include="Resources\Test.png" />
     <None Include="Resources\Warning.png" />

Source/Data/DataManager.cs

@@ -63,6 +63,9 @@ namespace CodeImp.DoomBuilder.Data
 		private LinkedList<ImageData> loadlist;
 		private Thread backgroundloader;
 		
+		// Image previews
+		private PreviewManager previews;
+		
 		// Special images
 		private ImageData missingtexture3d;
 		
@@ -160,6 +163,7 @@ namespace CodeImp.DoomBuilder.Data
 			texturenames = new List<string>();
 			flatnames = new List<string>();
 			loadlist = new LinkedList<ImageData>();
+			previews = new PreviewManager();
 			
 			// Go for all locations
 			foreach(DataLocation dl in locations)
@@ -226,6 +230,10 @@ namespace CodeImp.DoomBuilder.Data
 			// Stop background loader
 			StopBackgroundLoader();
 			
+			// Dispose preview manager
+			previews.Dispose();
+			previews = null;
+			
 			// Dispose resources
 			foreach(KeyValuePair<long, ImageData> i in textures) i.Value.Dispose();
 			foreach(KeyValuePair<long, ImageData> i in flats) i.Value.Dispose();

Source/Data/PreviewManager.cs

@@ -0,0 +1,84 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Imaging;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.IO;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal class PreviewManager : IDisposable
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Disposing
+		private bool isdisposed = false;
+
+		#endregion
+
+		#region ================== Properties
+
+		// Disposing
+		public bool IsDisposed { get { return isdisposed; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public PreviewManager()
+		{
+			// Initialize
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		#endregion
+	}
+}

Source/Properties/Resources.Designer.cs

@@ -109,6 +109,13 @@ namespace CodeImp.DoomBuilder.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap Grid2_arrowup {
+            get {
+                object obj = ResourceManager.GetObject("Grid2_arrowup", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap Grid4 {
             get {
                 object obj = ResourceManager.GetObject("Grid4", resourceCulture);
@@ -276,5 +283,12 @@ namespace CodeImp.DoomBuilder.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        internal static System.Drawing.Bitmap Zoom_arrowup {
+            get {
+                object obj = ResourceManager.GetObject("Zoom_arrowup", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }

Source/Properties/Resources.resx

@@ -211,4 +211,10 @@
   <data name="Paste" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Paste.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Grid2_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Grid2_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Zoom_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Zoom_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

Source/Windows/MainForm.Designer.cs

@@ -40,10 +40,10 @@ namespace CodeImp.DoomBuilder.Windows
 			System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
 			System.Windows.Forms.ToolStripSeparator toolstripSeperator1;
 			System.Windows.Forms.ToolStripSeparator toolstripSeperator6;
-			System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
-			System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
 			System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
 			System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
+			System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
+			System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
 			this.buttoneditmodesseperator = new System.Windows.Forms.ToolStripSeparator();
 			this.poscommalabel = new System.Windows.Forms.ToolStripStatusLabel();
@@ -73,6 +73,7 @@ namespace CodeImp.DoomBuilder.Windows
 			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();
 			this.configurationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -134,7 +135,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.menumode = new System.Windows.Forms.ToolStripMenuItem();
 			toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
 			toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
 			toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
@@ -146,10 +146,10 @@ namespace CodeImp.DoomBuilder.Windows
 			toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
 			toolstripSeperator1 = new System.Windows.Forms.ToolStripSeparator();
 			toolstripSeperator6 = new System.Windows.Forms.ToolStripSeparator();
-			toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
-			toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
 			toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
 			toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
+			toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
+			toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
 			this.menumain.SuspendLayout();
 			this.toolbar.SuspendLayout();
 			this.statusbar.SuspendLayout();
@@ -159,17 +159,17 @@ namespace CodeImp.DoomBuilder.Windows
 			// toolStripMenuItem1
 			// 
 			toolStripMenuItem1.Name = "toolStripMenuItem1";
-			toolStripMenuItem1.Size = new System.Drawing.Size(187, 6);
+			toolStripMenuItem1.Size = new System.Drawing.Size(198, 6);
 			// 
 			// toolStripMenuItem2
 			// 
 			toolStripMenuItem2.Name = "toolStripMenuItem2";
-			toolStripMenuItem2.Size = new System.Drawing.Size(187, 6);
+			toolStripMenuItem2.Size = new System.Drawing.Size(198, 6);
 			// 
 			// toolStripMenuItem3
 			// 
 			toolStripMenuItem3.Name = "toolStripMenuItem3";
-			toolStripMenuItem3.Size = new System.Drawing.Size(187, 6);
+			toolStripMenuItem3.Size = new System.Drawing.Size(198, 6);
 			// 
 			// toolStripSeparator1
 			// 
@@ -180,7 +180,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// toolStripSeparator4
 			// 
 			toolStripSeparator4.Name = "toolStripSeparator4";
-			toolStripSeparator4.Size = new System.Drawing.Size(183, 6);
+			toolStripSeparator4.Size = new System.Drawing.Size(194, 6);
 			// 
 			// toolStripSeparator9
 			// 
@@ -203,7 +203,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// toolStripSeparator11
 			// 
 			toolStripSeparator11.Name = "toolStripSeparator11";
-			toolStripSeparator11.Size = new System.Drawing.Size(151, 6);
+			toolStripSeparator11.Size = new System.Drawing.Size(162, 6);
 			// 
 			// toolstripSeperator1
 			// 
@@ -214,17 +214,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// toolstripSeperator6
 			// 
 			toolstripSeperator6.Name = "toolstripSeperator6";
-			toolstripSeperator6.Size = new System.Drawing.Size(151, 6);
+			toolstripSeperator6.Size = new System.Drawing.Size(162, 6);
-			// 
-			// toolStripMenuItem4
-			// 
-			toolStripMenuItem4.Name = "toolStripMenuItem4";
-			toolStripMenuItem4.Size = new System.Drawing.Size(150, 6);
-			// 
-			// toolStripSeparator2
-			// 
-			toolStripSeparator2.Name = "toolStripSeparator2";
-			toolStripSeparator2.Size = new System.Drawing.Size(153, 6);
 			// 
 			// toolStripSeparator7
 			// 
@@ -238,6 +228,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);
@@ -289,7 +289,7 @@ namespace CodeImp.DoomBuilder.Windows
 			this.itemnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.File;
 			this.itemnewmap.Name = "itemnewmap";
 			this.itemnewmap.ShortcutKeyDisplayString = "";
-			this.itemnewmap.Size = new System.Drawing.Size(190, 22);
+			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);
@@ -298,7 +298,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// 
 			this.itemopenmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap;
 			this.itemopenmap.Name = "itemopenmap";
-			this.itemopenmap.Size = new System.Drawing.Size(190, 22);
+			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);
@@ -306,7 +306,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemclosemap
 			// 
 			this.itemclosemap.Name = "itemclosemap";
-			this.itemclosemap.Size = new System.Drawing.Size(190, 22);
+			this.itemclosemap.Size = new System.Drawing.Size(201, 22);
 			this.itemclosemap.Tag = "builder_closemap";
 			this.itemclosemap.Text = "Close Map";
 			this.itemclosemap.Click += new System.EventHandler(this.InvokeTaggedAction);
@@ -315,7 +315,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// 
 			this.itemsavemap.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveMap;
 			this.itemsavemap.Name = "itemsavemap";
-			this.itemsavemap.Size = new System.Drawing.Size(190, 22);
+			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);
@@ -323,7 +323,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemsavemapas
 			// 
 			this.itemsavemapas.Name = "itemsavemapas";
-			this.itemsavemapas.Size = new System.Drawing.Size(190, 22);
+			this.itemsavemapas.Size = new System.Drawing.Size(201, 22);
 			this.itemsavemapas.Tag = "builder_savemapas";
 			this.itemsavemapas.Text = "Save Map As...";
 			this.itemsavemapas.Click += new System.EventHandler(this.InvokeTaggedAction);
@@ -331,7 +331,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemsavemapinto
 			// 
 			this.itemsavemapinto.Name = "itemsavemapinto";
-			this.itemsavemapinto.Size = new System.Drawing.Size(190, 22);
+			this.itemsavemapinto.Size = new System.Drawing.Size(201, 22);
 			this.itemsavemapinto.Tag = "builder_savemapinto";
 			this.itemsavemapinto.Text = "Save Map Into...";
 			this.itemsavemapinto.Click += new System.EventHandler(this.InvokeTaggedAction);
@@ -339,13 +339,13 @@ namespace CodeImp.DoomBuilder.Windows
 			// toolStripMenuItem5
 			// 
 			this.toolStripMenuItem5.Name = "toolStripMenuItem5";
-			this.toolStripMenuItem5.Size = new System.Drawing.Size(187, 6);
+			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(190, 22);
+			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);
@@ -354,13 +354,13 @@ namespace CodeImp.DoomBuilder.Windows
 			// 
 			this.itemnorecent.Enabled = false;
 			this.itemnorecent.Name = "itemnorecent";
-			this.itemnorecent.Size = new System.Drawing.Size(190, 22);
+			this.itemnorecent.Size = new System.Drawing.Size(201, 22);
 			this.itemnorecent.Text = "No recently opened files";
 			// 
 			// itemexit
 			// 
 			this.itemexit.Name = "itemexit";
-			this.itemexit.Size = new System.Drawing.Size(190, 22);
+			this.itemexit.Size = new System.Drawing.Size(201, 22);
 			this.itemexit.Text = "Exit";
 			this.itemexit.Click += new System.EventHandler(this.itemexit_Click);
 			// 
@@ -390,7 +390,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// 
 			this.itemundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo;
 			this.itemundo.Name = "itemundo";
-			this.itemundo.Size = new System.Drawing.Size(154, 22);
+			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);
@@ -399,7 +399,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// 
 			this.itemredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo;
 			this.itemredo.Name = "itemredo";
-			this.itemredo.Size = new System.Drawing.Size(154, 22);
+			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);
@@ -407,13 +407,13 @@ namespace CodeImp.DoomBuilder.Windows
 			// toolStripMenuItem7
 			// 
 			this.toolStripMenuItem7.Name = "toolStripMenuItem7";
-			this.toolStripMenuItem7.Size = new System.Drawing.Size(151, 6);
+			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(154, 22);
+			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);
@@ -422,7 +422,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// 
 			this.itemcopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy;
 			this.itemcopy.Name = "itemcopy";
-			this.itemcopy.Size = new System.Drawing.Size(154, 22);
+			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);
@@ -431,7 +431,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// 
 			this.itempaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste;
 			this.itempaste.Name = "itempaste";
-			this.itempaste.Size = new System.Drawing.Size(154, 22);
+			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);
@@ -442,7 +442,7 @@ namespace CodeImp.DoomBuilder.Windows
 			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(154, 22);
+			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);
@@ -453,7 +453,7 @@ namespace CodeImp.DoomBuilder.Windows
 			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(154, 22);
+			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);
@@ -461,12 +461,12 @@ namespace CodeImp.DoomBuilder.Windows
 			// toolStripMenuItem6
 			// 
 			this.toolStripMenuItem6.Name = "toolStripMenuItem6";
-			this.toolStripMenuItem6.Size = new System.Drawing.Size(151, 6);
+			this.toolStripMenuItem6.Size = new System.Drawing.Size(162, 6);
 			// 
 			// itemgridinc
 			// 
 			this.itemgridinc.Name = "itemgridinc";
-			this.itemgridinc.Size = new System.Drawing.Size(154, 22);
+			this.itemgridinc.Size = new System.Drawing.Size(165, 22);
 			this.itemgridinc.Tag = "builder_gridinc";
 			this.itemgridinc.Text = "Increase Grid";
 			this.itemgridinc.Click += new System.EventHandler(this.InvokeTaggedAction);
@@ -474,7 +474,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemgriddec
 			// 
 			this.itemgriddec.Name = "itemgriddec";
-			this.itemgriddec.Size = new System.Drawing.Size(154, 22);
+			this.itemgriddec.Size = new System.Drawing.Size(165, 22);
 			this.itemgriddec.Tag = "builder_griddec";
 			this.itemgriddec.Text = "Decrease Grid";
 			this.itemgriddec.Click += new System.EventHandler(this.InvokeTaggedAction);
@@ -483,7 +483,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// 
 			this.itemgridsetup.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2;
 			this.itemgridsetup.Name = "itemgridsetup";
-			this.itemgridsetup.Size = new System.Drawing.Size(154, 22);
+			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);
@@ -492,11 +492,17 @@ namespace CodeImp.DoomBuilder.Windows
 			// 
 			this.itemmapoptions.Image = global::CodeImp.DoomBuilder.Properties.Resources.Properties;
 			this.itemmapoptions.Name = "itemmapoptions";
-			this.itemmapoptions.Size = new System.Drawing.Size(154, 22);
+			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";
+			this.menumode.Size = new System.Drawing.Size(45, 20);
+			this.menumode.Text = "Mode";
+			// 
 			// menutools
 			// 
 			this.menutools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -511,7 +517,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemreloadresources
 			// 
 			this.itemreloadresources.Name = "itemreloadresources";
-			this.itemreloadresources.Size = new System.Drawing.Size(186, 22);
+			this.itemreloadresources.Size = new System.Drawing.Size(197, 22);
 			this.itemreloadresources.Tag = "builder_reloadresources";
 			this.itemreloadresources.Text = "Reload Resources";
 			this.itemreloadresources.Click += new System.EventHandler(this.InvokeTaggedAction);
@@ -519,7 +525,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// configurationToolStripMenuItem
 			// 
 			this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem";
-			this.configurationToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+			this.configurationToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
 			this.configurationToolStripMenuItem.Tag = "builder_configuration";
 			this.configurationToolStripMenuItem.Text = "Game Configurations...";
 			this.configurationToolStripMenuItem.Click += new System.EventHandler(this.InvokeTaggedAction);
@@ -527,7 +533,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// preferencesToolStripMenuItem
 			// 
 			this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem";
-			this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+			this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
 			this.preferencesToolStripMenuItem.Tag = "builder_preferences";
 			this.preferencesToolStripMenuItem.Text = "Preferences...";
 			this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.InvokeTaggedAction);
@@ -543,7 +549,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemhelpabout
 			// 
 			this.itemhelpabout.Name = "itemhelpabout";
-			this.itemhelpabout.Size = new System.Drawing.Size(180, 22);
+			this.itemhelpabout.Size = new System.Drawing.Size(191, 22);
 			this.itemhelpabout.Text = "About Doom Builder...";
 			this.itemhelpabout.Click += new System.EventHandler(this.itemhelpabout_Click);
 			// 
@@ -702,8 +708,8 @@ namespace CodeImp.DoomBuilder.Windows
 			this.thingfilters.Name = "thingfilters";
 			this.thingfilters.Size = new System.Drawing.Size(130, 25);
 			this.thingfilters.ToolTipText = "Things Filter";
-			this.thingfilters.SelectedIndexChanged += new System.EventHandler(this.thingfilters_SelectedIndexChanged);
 			this.thingfilters.DropDownClosed += new System.EventHandler(this.LoseFocus);
+			this.thingfilters.SelectedIndexChanged += new System.EventHandler(this.thingfilters_SelectedIndexChanged);
 			// 
 			// toolStripSeparator8
 			// 
@@ -789,7 +795,7 @@ namespace CodeImp.DoomBuilder.Windows
 			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.Size = new System.Drawing.Size(365, 18);
 			this.statuslabel.Spring = true;
 			this.statuslabel.Text = "Initializing user interface...";
 			this.statuslabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -831,16 +837,18 @@ namespace CodeImp.DoomBuilder.Windows
             this.itemgrid4,
             toolStripMenuItem4,
             this.itemgridcustom});
-			this.buttongrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2;
+			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(153, 22);
+			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);
@@ -848,7 +856,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemgrid512
 			// 
 			this.itemgrid512.Name = "itemgrid512";
-			this.itemgrid512.Size = new System.Drawing.Size(153, 22);
+			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);
@@ -856,7 +864,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemgrid256
 			// 
 			this.itemgrid256.Name = "itemgrid256";
-			this.itemgrid256.Size = new System.Drawing.Size(153, 22);
+			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);
@@ -864,7 +872,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemgrid128
 			// 
 			this.itemgrid128.Name = "itemgrid128";
-			this.itemgrid128.Size = new System.Drawing.Size(153, 22);
+			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);
@@ -872,7 +880,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemgrid64
 			// 
 			this.itemgrid64.Name = "itemgrid64";
-			this.itemgrid64.Size = new System.Drawing.Size(153, 22);
+			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);
@@ -880,7 +888,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemgrid32
 			// 
 			this.itemgrid32.Name = "itemgrid32";
-			this.itemgrid32.Size = new System.Drawing.Size(153, 22);
+			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);
@@ -888,7 +896,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemgrid16
 			// 
 			this.itemgrid16.Name = "itemgrid16";
-			this.itemgrid16.Size = new System.Drawing.Size(153, 22);
+			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);
@@ -896,7 +904,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemgrid8
 			// 
 			this.itemgrid8.Name = "itemgrid8";
-			this.itemgrid8.Size = new System.Drawing.Size(153, 22);
+			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);
@@ -904,7 +912,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemgrid4
 			// 
 			this.itemgrid4.Name = "itemgrid4";
-			this.itemgrid4.Size = new System.Drawing.Size(153, 22);
+			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);
@@ -912,7 +920,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemgridcustom
 			// 
 			this.itemgridcustom.Name = "itemgridcustom";
-			this.itemgridcustom.Size = new System.Drawing.Size(153, 22);
+			this.itemgridcustom.Size = new System.Drawing.Size(164, 22);
 			this.itemgridcustom.Text = "Customize...";
 			this.itemgridcustom.Click += new System.EventHandler(this.itemgridcustom_Click);
 			// 
@@ -940,16 +948,18 @@ namespace CodeImp.DoomBuilder.Windows
             this.itemzoom5,
             toolStripSeparator2,
             this.itemzoomfittoscreen});
-			this.buttonzoom.Image = global::CodeImp.DoomBuilder.Properties.Resources.Zoom;
+			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(156, 22);
+			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);
@@ -957,7 +967,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemzoom100
 			// 
 			this.itemzoom100.Name = "itemzoom100";
-			this.itemzoom100.Size = new System.Drawing.Size(156, 22);
+			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);
@@ -965,7 +975,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemzoom50
 			// 
 			this.itemzoom50.Name = "itemzoom50";
-			this.itemzoom50.Size = new System.Drawing.Size(156, 22);
+			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);
@@ -973,7 +983,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemzoom25
 			// 
 			this.itemzoom25.Name = "itemzoom25";
-			this.itemzoom25.Size = new System.Drawing.Size(156, 22);
+			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);
@@ -981,7 +991,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemzoom10
 			// 
 			this.itemzoom10.Name = "itemzoom10";
-			this.itemzoom10.Size = new System.Drawing.Size(156, 22);
+			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);
@@ -989,7 +999,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemzoom5
 			// 
 			this.itemzoom5.Name = "itemzoom5";
-			this.itemzoom5.Size = new System.Drawing.Size(156, 22);
+			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);
@@ -997,7 +1007,7 @@ namespace CodeImp.DoomBuilder.Windows
 			// itemzoomfittoscreen
 			// 
 			this.itemzoomfittoscreen.Name = "itemzoomfittoscreen";
-			this.itemzoomfittoscreen.Size = new System.Drawing.Size(156, 22);
+			this.itemzoomfittoscreen.Size = new System.Drawing.Size(167, 22);
 			this.itemzoomfittoscreen.Text = "Fit to screen";
 			this.itemzoomfittoscreen.Click += new System.EventHandler(this.itemzoomfittoscreen_Click);
 			// 
@@ -1105,14 +1115,14 @@ namespace CodeImp.DoomBuilder.Windows
 			this.display.Size = new System.Drawing.Size(1012, 515);
 			this.display.TabIndex = 5;
 			this.display.MouseLeave += new System.EventHandler(this.display_MouseLeave);
-			this.display.Paint += new System.Windows.Forms.PaintEventHandler(this.display_Paint);
-			this.display.MouseMove += new System.Windows.Forms.MouseEventHandler(this.display_MouseMove);
-			this.display.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseDoubleClick);
-			this.display.MouseClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseClick);
 			this.display.MouseDown += new System.Windows.Forms.MouseEventHandler(this.display_MouseDown);
+			this.display.MouseMove += new System.Windows.Forms.MouseEventHandler(this.display_MouseMove);
+			this.display.MouseClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseClick);
+			this.display.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseDoubleClick);
 			this.display.Resize += new System.EventHandler(this.display_Resize);
-			this.display.MouseUp += new System.Windows.Forms.MouseEventHandler(this.display_MouseUp);
 			this.display.MouseEnter += new System.EventHandler(this.display_MouseEnter);
+			this.display.Paint += new System.Windows.Forms.PaintEventHandler(this.display_Paint);
+			this.display.MouseUp += new System.Windows.Forms.MouseEventHandler(this.display_MouseUp);
 			// 
 			// processor
 			// 
@@ -1127,12 +1137,6 @@ namespace CodeImp.DoomBuilder.Windows
 			// 
 			this.warningflasher.Tick += new System.EventHandler(this.warningflasher_Tick);
 			// 
-			// menumode
-			// 
-			this.menumode.Name = "menumode";
-			this.menumode.Size = new System.Drawing.Size(45, 20);
-			this.menumode.Text = "Mode";
-			// 
 			// MainForm
 			// 
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1150,15 +1154,15 @@ namespace CodeImp.DoomBuilder.Windows
 			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
 			this.Text = "Doom Builder";
 			this.Deactivate += new System.EventHandler(this.MainForm_Deactivate);
-			this.Load += new System.EventHandler(this.MainForm_Load);
+			this.Resize += new System.EventHandler(this.MainForm_Resize);
 			this.Shown += new System.EventHandler(this.MainForm_Shown);
 			this.Activated += new System.EventHandler(this.MainForm_Activated);
-			this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyUp);
 			this.Move += new System.EventHandler(this.MainForm_Move);
 			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
-			this.Resize += new System.EventHandler(this.MainForm_Resize);
+			this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyUp);
 			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyDown);
 			this.ResizeEnd += new System.EventHandler(this.MainForm_ResizeEnd);
+			this.Load += new System.EventHandler(this.MainForm_Load);
 			this.menumain.ResumeLayout(false);
 			this.menumain.PerformLayout();
 			this.toolbar.ResumeLayout(false);

Source/Windows/MainForm.resx

@@ -150,18 +150,18 @@
   <metadata name="toolstripSeperator6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="toolStripMenuItem4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="toolStripSeparator2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="toolStripSeparator7.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="toolStripSeparator12.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
+  <metadata name="toolStripMenuItem4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="toolStripSeparator2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <metadata name="menumain.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>