From 09ea99323ef93bc1e3eb1bc797b70116c231ec39 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Thu, 10 Mar 2011 03:33:53 +0000 Subject: [PATCH] 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 | 15 ------- .../tools/HexEditor.Designer.cs | 42 ++++++++++++------- BizHawk.MultiClient/tools/HexEditor.cs | 38 +++++++++++------ 3 files changed, 53 insertions(+), 42 deletions(-) diff --git a/BizHawk.MultiClient/config/HotkeyWindow.cs b/BizHawk.MultiClient/config/HotkeyWindow.cs index 09f1f54a23..c5f6850c73 100644 --- a/BizHawk.MultiClient/config/HotkeyWindow.cs +++ b/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(); } diff --git a/BizHawk.MultiClient/tools/HexEditor.Designer.cs b/BizHawk.MultiClient/tools/HexEditor.Designer.cs index 4054302b5f..2375443be9 100644 --- a/BizHawk.MultiClient/tools/HexEditor.Designer.cs +++ b/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.addToRamWatchToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.saveWindowsSettingsToolStripMenuItem = 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.toolStripSeparator2.Size = new System.Drawing.Size(201, 6); - // - // 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); + this.saveWindowsSettingsToolStripMenuItem.Name = "saveWindowsSettingsToolStripMenuItem"; + this.saveWindowsSettingsToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.saveWindowsSettingsToolStripMenuItem.Text = "Save windows settings"; + this.saveWindowsSettingsToolStripMenuItem.Click += new System.EventHandler(this.saveWindowsSettingsToolStripMenuItem_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; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs index 529cfbeb1b..11ee9881e2 100644 --- a/BizHawk.MultiClient/tools/HexEditor.cs +++ b/BizHawk.MultiClient/tools/HexEditor.cs @@ -31,25 +31,29 @@ namespace BizHawk.MultiClient public void SaveConfigSettings() { - 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; + 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.HexEditorWndx >= 0 && Global.Config.HexEditorWndy >= 0) - this.Location = new Point(Global.Config.HexEditorWndx, Global.Config.HexEditorWndy); - - if (Global.Config.HexEditorWidth >= 0 && Global.Config.HexEditorHeight >= 0) + if (Global.Config.HexEditorSaveWindowPosition) { - this.Size = new System.Drawing.Size(Global.Config.HexEditorWidth, Global.Config.HexEditorHeight); - } + if (Global.Config.HexEditorWndx >= 0 && Global.Config.HexEditorWndy >= 0) + this.Location = new Point(Global.Config.HexEditorWndx, Global.Config.HexEditorWndy); + if (Global.Config.HexEditorWidth >= 0 && Global.Config.HexEditorHeight >= 0) + { + 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; + } + } }