Code cleanup of last commit. Hex Editor cleanups - Fix Hex editor auto-load menu item, implement save window position menu item. Fix auto-load menu item check, was being done in the options menu drop down event instead of settings.

BizHawk.MultiClient/config/HotkeyWindow.cs

@@ -115,21 +115,6 @@ namespace BizHawk.MultiClient.tools
 
         private void hotkeyTabs_SelectedIndexChanged(object sender, EventArgs e)
         {
-            /*
-            switch (hotkeyTabs.SelectedIndex)
-            {
-                default:
-                case 0:
-                    IDW_FRAMEADVANCE.Focus();
-                    break;
-                case 1:
-                    IDW_SS1.Focus();
-                    break;
-                case 2:
-                    IDW_TOGGLEMTRACK.Focus();
-                    break;
-            }
-             */
             hotkeyTabs.TabPages[hotkeyTabs.SelectedIndex].Controls[0].Focus(); 
         }
        

BizHawk.MultiClient/tools/HexEditor.Designer.cs

@@ -42,7 +42,9 @@
             this.byteToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.byteToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
             this.enToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.goToAddressToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.addToRamWatchToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -52,8 +54,7 @@
             this.freezeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.addToRamWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.MemoryViewer = new BizHawk.MultiClient.MemoryViewer();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.saveWindowsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.addToRamWatchToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.ViewerContextMenuStrip.SuspendLayout();
             this.SuspendLayout();
@@ -157,6 +158,11 @@
             this.enToolStripMenuItem.Text = "Big Endian";
             this.enToolStripMenuItem.Click += new System.EventHandler(this.enToolStripMenuItem_Click);
             // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(201, 6);
+            // 
             // goToAddressToolStripMenuItem
             // 
             this.goToAddressToolStripMenuItem.Name = "goToAddressToolStripMenuItem";
@@ -165,27 +171,37 @@
             this.goToAddressToolStripMenuItem.Text = "&Go to Address...";
             this.goToAddressToolStripMenuItem.Click += new System.EventHandler(this.goToAddressToolStripMenuItem_Click);
             // 
+            // addToRamWatchToolStripMenuItem1
+            // 
+            this.addToRamWatchToolStripMenuItem1.Name = "addToRamWatchToolStripMenuItem1";
+            this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(204, 22);
+            this.addToRamWatchToolStripMenuItem1.Text = "Add to Ram Watch";
+            this.addToRamWatchToolStripMenuItem1.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem1_Click);
+            // 
             // settingsToolStripMenuItem
             // 
             this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.restoreWindowSizeToolStripMenuItem,
-            this.autoloadToolStripMenuItem});
+            this.autoloadToolStripMenuItem,
+            this.saveWindowsSettingsToolStripMenuItem});
             this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
             this.settingsToolStripMenuItem.Size = new System.Drawing.Size(58, 20);
             this.settingsToolStripMenuItem.Text = "&Settings";
+            this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_DropDownOpened);
             // 
             // restoreWindowSizeToolStripMenuItem
             // 
             this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem";
-            this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+            this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
             this.restoreWindowSizeToolStripMenuItem.Text = "&Restore Window Size";
             this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click);
             // 
             // autoloadToolStripMenuItem
             // 
             this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem";
-            this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+            this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
             this.autoloadToolStripMenuItem.Text = "Auto-load";
+            this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click);
             // 
             // AddressBox
             // 
@@ -240,17 +256,12 @@
             this.MemoryViewer.Paint += new System.Windows.Forms.PaintEventHandler(this.MemoryViewer_Paint);
             this.MemoryViewer.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.MemoryViewer_MouseDoubleClick);
             // 
-            // toolStripSeparator2
+            // saveWindowsSettingsToolStripMenuItem
             // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.saveWindowsSettingsToolStripMenuItem.Name = "saveWindowsSettingsToolStripMenuItem";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(201, 6);
+            this.saveWindowsSettingsToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
-            // 
+            this.saveWindowsSettingsToolStripMenuItem.Text = "Save windows settings";
-            // addToRamWatchToolStripMenuItem1
+            this.saveWindowsSettingsToolStripMenuItem.Click += new System.EventHandler(this.saveWindowsSettingsToolStripMenuItem_Click);
-            // 
-            this.addToRamWatchToolStripMenuItem1.Name = "addToRamWatchToolStripMenuItem1";
-            this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(204, 22);
-            this.addToRamWatchToolStripMenuItem1.Text = "Add to Ram Watch";
-            this.addToRamWatchToolStripMenuItem1.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem1_Click);
             // 
             // HexEditor
             // 
@@ -300,5 +311,6 @@
         private System.Windows.Forms.ToolStripMenuItem addToRamWatchToolStripMenuItem;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         private System.Windows.Forms.ToolStripMenuItem addToRamWatchToolStripMenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem saveWindowsSettingsToolStripMenuItem;
     }
 }

BizHawk.MultiClient/tools/HexEditor.cs

@@ -30,18 +30,22 @@ namespace BizHawk.MultiClient
         }
 
         public void SaveConfigSettings()
+        {
+            if (Global.Config.HexEditorSaveWindowPosition)
             {
                 Global.Config.HexEditorWndx = this.Location.X;
                 Global.Config.HexEditorWndy = this.Location.Y;
                 Global.Config.HexEditorWidth = this.Right - this.Left;
                 Global.Config.HexEditorHeight = this.Bottom - this.Top;
             }
+        }
 
         private void HexEditor_Load(object sender, EventArgs e)
         {
             defaultWidth = this.Size.Width;     //Save these first so that the user can restore to its original size
             defaultHeight = this.Size.Height;
-
+            if (Global.Config.HexEditorSaveWindowPosition)
+            {
                 if (Global.Config.HexEditorWndx >= 0 && Global.Config.HexEditorWndy >= 0)
                     this.Location = new Point(Global.Config.HexEditorWndx, Global.Config.HexEditorWndy);
 
@@ -49,7 +53,7 @@ namespace BizHawk.MultiClient
                 {
                     this.Size = new System.Drawing.Size(Global.Config.HexEditorWidth, Global.Config.HexEditorHeight);
                 }
-
+            }
             SetMemoryDomainMenu();
         }
 
@@ -82,7 +86,6 @@ namespace BizHawk.MultiClient
 
         private void optionsToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
         {
-            autoloadToolStripMenuItem.Checked = Global.Config.AutoLoadHexEditor;
             enToolStripMenuItem.Checked = MemoryViewer.BigEndian;
             switch (MemoryViewer.GetDataSize())
             {
@@ -285,6 +288,17 @@ namespace BizHawk.MultiClient
             AddToRamWatch();
         }
 
+        private void saveWindowsSettingsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            Global.Config.HexEditorSaveWindowPosition ^= true;
+        }
+
+        private void settingsToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+        {
+            autoloadToolStripMenuItem.Checked = Global.Config.AutoLoadHexEditor;
+            saveWindowsSettingsToolStripMenuItem.Checked = Global.Config.HexEditorSaveWindowPosition;
+        }
+
         
     }
 }