From 5a20a520bdfeaf1b9d2b668b6e6f5df0e545e16a Mon Sep 17 00:00:00 2001 From: Isotarge Date: Fri, 22 Jul 2016 01:32:54 +0930 Subject: [PATCH] Tools: Ram -> RAM #669 --- BizHawk.Client.Common/config/Binding.cs | 16 ++++++++-------- BizHawk.Client.Common/tools/RamSearchEngine.cs | 2 +- BizHawk.Client.EmuHawk/MainForm.Events.cs | 4 ++-- BizHawk.Client.EmuHawk/MainForm.Hotkey.cs | 6 +++--- BizHawk.Client.EmuHawk/Watch.cs | 4 ++-- .../tools/HexEditor/HexEditor.Designer.cs | 4 ++-- .../tools/Lua/Libraries/EmuLuaLibrary.Client.cs | 4 ++-- BizHawk.Client.EmuHawk/tools/ToolManager.cs | 12 ++++++------ .../tools/Watch/RamSearch.Designer.cs | 8 ++++---- BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs | 4 ++-- .../tools/Watch/RamWatch.Designer.cs | 2 +- BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 2 +- .../Interfaces/Services/IMemoryDomains.cs | 2 +- Dist/changelog.txt | 14 +++++++------- 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/BizHawk.Client.Common/config/Binding.cs b/BizHawk.Client.Common/config/Binding.cs index 9ae6aeda96..6f98ce0715 100644 --- a/BizHawk.Client.Common/config/Binding.cs +++ b/BizHawk.Client.Common/config/Binding.cs @@ -202,8 +202,8 @@ namespace BizHawk.Client.Common Bind("Movie", "Movie Poke"), Bind("Movie", "Scrub Input"), - Bind("Tools", "Ram Watch"), - Bind("Tools", "Ram Search"), + Bind("Tools", "RAM Watch"), + Bind("Tools", "RAM Search"), Bind("Tools", "Hex Editor"), Bind("Tools", "Trace Logger"), Bind("Tools", "Lua Console"), @@ -212,12 +212,12 @@ namespace BizHawk.Client.Common Bind("Tools", "ToolBox", "Shift+T"), Bind("Tools", "Virtual Pad"), - Bind("Ram Search", "New Search"), - Bind("Ram Search", "Do Search"), - Bind("Ram Search", "Previous Compare To"), - Bind("Ram Search", "Next Compare To"), - Bind("Ram Search", "Previous Operator"), - Bind("Ram Search", "Next Operator"), + Bind("RAM Search", "New Search"), + Bind("RAM Search", "Do Search"), + Bind("RAM Search", "Previous Compare To"), + Bind("RAM Search", "Next Compare To"), + Bind("RAM Search", "Previous Operator"), + Bind("RAM Search", "Next Operator"), Bind("TAStudio", "Add Branch", "Alt+Insert"), Bind("TAStudio", "Delete Branch", "Alt+Delete"), diff --git a/BizHawk.Client.Common/tools/RamSearchEngine.cs b/BizHawk.Client.Common/tools/RamSearchEngine.cs index ccbb459d2d..60c9f97233 100644 --- a/BizHawk.Client.Common/tools/RamSearchEngine.cs +++ b/BizHawk.Client.Common/tools/RamSearchEngine.cs @@ -358,7 +358,7 @@ namespace BizHawk.Client.Common _history.AddState(_watchList); } - var removeList = indices.Select(i => _watchList[i]); // This will fail after int.MaxValue but Ram Search fails on domains that large anyway + var removeList = indices.Select(i => _watchList[i]); // This will fail after int.MaxValue but RAM Search fails on domains that large anyway _watchList = _watchList.Except(removeList).ToList(); } diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 59bd270713..0166d6e68b 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1288,8 +1288,8 @@ namespace BizHawk.Client.EmuHawk private void ToolsSubMenu_DropDownOpened(object sender, EventArgs e) { ToolBoxMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["ToolBox"].Bindings; - RamWatchMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Ram Watch"].Bindings; - RamSearchMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Ram Search"].Bindings; + RamWatchMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["RAM Watch"].Bindings; + RamSearchMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["RAM Search"].Bindings; HexEditorMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Hex Editor"].Bindings; LuaConsoleMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Lua Console"].Bindings; CheatsMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Cheats"].Bindings; diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index 1ab512462b..a9411f72fe 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -298,10 +298,10 @@ namespace BizHawk.Client.EmuHawk break; // Tools - case "Ram Watch": + case "RAM Watch": GlobalWin.Tools.LoadRamWatch(true); break; - case "Ram Search": + case "RAM Search": GlobalWin.Tools.Load(); break; case "Hex Editor": @@ -326,7 +326,7 @@ namespace BizHawk.Client.EmuHawk GlobalWin.Tools.Load(); break; - // Ram Search + // RAM Search case "Do Search": if (GlobalWin.Tools.IsLoaded()) GlobalWin.Tools.RamSearch.DoSearch(); diff --git a/BizHawk.Client.EmuHawk/Watch.cs b/BizHawk.Client.EmuHawk/Watch.cs index 47ffd0868b..f76c1f3765 100644 --- a/BizHawk.Client.EmuHawk/Watch.cs +++ b/BizHawk.Client.EmuHawk/Watch.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; namespace BizHawk.Client.EmuHawk { - //Data structure for a watch item in the Ram Watch Dialog + //Data structure for a watch item in the RAM Watch Dialog public enum atype { BYTE, WORD, DWORD, SEPARATOR }; //TODO: more custom types too like 12.4 and 24.12 fixed point public enum asigned { SIGNED, UNSIGNED, HEX }; public class Watch diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs index 727dd6bc3e..14a56104cc 100644 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs @@ -358,7 +358,7 @@ this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem"; this.AddToRamWatchMenuItem.ShortcutKeyDisplayString = "Ctrl+W"; this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(217, 22); - this.AddToRamWatchMenuItem.Text = "Add to Ram Watch"; + this.AddToRamWatchMenuItem.Text = "Add to RAM Watch"; this.AddToRamWatchMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); // // FreezeAddressMenuItem @@ -497,7 +497,7 @@ this.AddToRamWatchContextItem.Name = "AddToRamWatchContextItem"; this.AddToRamWatchContextItem.ShortcutKeyDisplayString = "Ctrl+W"; this.AddToRamWatchContextItem.Size = new System.Drawing.Size(206, 22); - this.AddToRamWatchContextItem.Text = "&Add to Ram Watch"; + this.AddToRamWatchContextItem.Text = "&Add to RAM Watch"; this.AddToRamWatchContextItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); // // UnfreezeAllContextItem diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs index d6c68112b8..cfe2846f7f 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs @@ -227,7 +227,7 @@ namespace BizHawk.Client.EmuHawk [LuaMethodAttributes( "openramwatch", - "opens the Ram Watch dialog" + "opens the RAM Watch dialog" )] public static void OpenRamWatch() { @@ -236,7 +236,7 @@ namespace BizHawk.Client.EmuHawk [LuaMethodAttributes( "openramsearch", - "opens the Ram Search dialog" + "opens the RAM Search dialog" )] public static void OpenRamSearch() { diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs index 7a50c0a849..938fd3c607 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -400,7 +400,7 @@ namespace BizHawk.Client.EmuHawk foreach (var tool in beforeList) { if (!tool.IsDisposed || - (tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed + (tool is RamWatch && Global.Config.DisplayRamWatch)) // RAM Watch hack, on screen display should run even if RAM Watch is closed { tool.UpdateValues(); } @@ -413,7 +413,7 @@ namespace BizHawk.Client.EmuHawk foreach (var tool in afterList) { if (!tool.IsDisposed || - (tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed + (tool is RamWatch && Global.Config.DisplayRamWatch)) // RAM Watch hack, on screen display should run even if RAM Watch is closed { tool.UpdateValues(); } @@ -429,7 +429,7 @@ namespace BizHawk.Client.EmuHawk if (tool != null) { if (!tool.IsDisposed || - (tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed + (tool is RamWatch && Global.Config.DisplayRamWatch)) // RAM Watch hack, on screen display should run even if RAM Watch is closed { tool.UpdateValues(); } @@ -452,7 +452,7 @@ namespace BizHawk.Client.EmuHawk { ServiceInjector.UpdateServices(Global.Emulator.ServiceProvider, tool); bool restartTool = false; - if ((tool.IsHandleCreated && !tool.IsDisposed) || tool is RamWatch) // Hack for Ram Watch - in display watches mode it wants to keep running even closed, it will handle disposed logic + if ((tool.IsHandleCreated && !tool.IsDisposed) || tool is RamWatch) // Hack for RAM Watch - in display watches mode it wants to keep running even closed, it will handle disposed logic restartTool = true; if (tool is LuaConsole && ((LuaConsole)tool).IsRebootingCore) restartTool = false; @@ -656,7 +656,7 @@ namespace BizHawk.Client.EmuHawk foreach (var tool in beforeList) { if (!tool.IsDisposed || - (tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed + (tool is RamWatch && Global.Config.DisplayRamWatch)) // RAM Watch hack, on screen display should run even if RAM Watch is closed { tool.FastUpdate(); } @@ -674,7 +674,7 @@ namespace BizHawk.Client.EmuHawk foreach (var tool in afterList) { if (!tool.IsDisposed || - (tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed + (tool is RamWatch && Global.Config.DisplayRamWatch)) // RAM Watch hack, on screen display should run even if RAM Watch is closed { tool.FastUpdate(); } diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs index b043ac2c01..132ab9f6c8 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs @@ -298,7 +298,7 @@ this.AddToRamWatchContextMenuItem.Name = "AddToRamWatchContextMenuItem"; this.AddToRamWatchContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R"; this.AddToRamWatchContextMenuItem.Size = new System.Drawing.Size(215, 22); - this.AddToRamWatchContextMenuItem.Text = "Add to Ram Watch"; + this.AddToRamWatchContextMenuItem.Text = "Add to RAM Watch"; this.AddToRamWatchContextMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); // // PokeContextMenuItem @@ -708,7 +708,7 @@ this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem"; this.AddToRamWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W))); this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(219, 22); - this.AddToRamWatchMenuItem.Text = "&Add to Ram Watch"; + this.AddToRamWatchMenuItem.Text = "&Add to RAM Watch"; this.AddToRamWatchMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); // // PokeAddressMenuItem @@ -792,7 +792,7 @@ // this.ExcludeRamWatchMenuItem.Name = "ExcludeRamWatchMenuItem"; this.ExcludeRamWatchMenuItem.Size = new System.Drawing.Size(240, 22); - this.ExcludeRamWatchMenuItem.Text = "Always E&xclude Ram Search List"; + this.ExcludeRamWatchMenuItem.Text = "Always E&xclude RAM Search List"; this.ExcludeRamWatchMenuItem.Click += new System.EventHandler(this.ExcludeRamWatchMenuItem_Click); // // UseUndoHistoryMenuItem @@ -1395,7 +1395,7 @@ this.MinimumSize = new System.Drawing.Size(290, 399); this.Name = "RamSearch"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Ram Search"; + this.Text = "RAM Search"; this.Activated += new System.EventHandler(this.NewRamSearch_Activated); this.Load += new System.EventHandler(this.RamSearch_Load); this.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragDrop); diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index aab85072a5..d07b9b414b 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; @@ -43,7 +43,7 @@ namespace BizHawk.Client.EmuHawk private bool _dropdownDontfire; // Used as a hack to get around lame .net dropdowns, there's no way to set their index without firing the selectedindexchanged event! public const int MaxDetailedSize = 1024 * 1024; // 1mb, semi-arbituary decision, sets the size to check for and automatically switch to fast mode for the user - public const int MaxSupportedSize = 1024 * 1024 * 64; // 64mb, semi-arbituary decision, sets the maximum size ram search will support (as it will crash beyond this) + public const int MaxSupportedSize = 1024 * 1024 * 64; // 64mb, semi-arbituary decision, sets the maximum size RAM Search will support (as it will crash beyond this) #region Initialize, Load, and Save diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs index 4a1a8e3677..293d08a104 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs @@ -932,7 +932,7 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "RamWatch"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = " Ram Watch"; + this.Text = " RAM Watch"; this.Activated += new System.EventHandler(this.NewRamWatch_Activated); this.Load += new System.EventHandler(this.NewRamWatch_Load); this.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop); diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index 1c7078cfb0..b36c03bc1c 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -129,7 +129,7 @@ namespace BizHawk.Client.EmuHawk if (_watches.Changes) { GlobalWin.Sound.StopSound(); - var result = MessageBox.Show("Save Changes?", "Ram Watch", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3); + var result = MessageBox.Show("Save Changes?", "RAM Watch", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3); GlobalWin.Sound.StartSound(); if (result == DialogResult.Yes) { diff --git a/BizHawk.Emulation.Common/Interfaces/Services/IMemoryDomains.cs b/BizHawk.Emulation.Common/Interfaces/Services/IMemoryDomains.cs index 1e293dcbf2..df81826e33 100644 --- a/BizHawk.Emulation.Common/Interfaces/Services/IMemoryDomains.cs +++ b/BizHawk.Emulation.Common/Interfaces/Services/IMemoryDomains.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Common /// All cores sould implement a SystemBus that represents the standard cpu bus range used for cheats for that system, /// In order to have a cheat system available for the core /// All domains should implement both peek and poke. However, if something isn't developed it should throw NotImplementedException rather than silently fail - /// If this service is available the client will expose many RAM related tools such as the Hex Editor, Ram Search/Watch, and Cheats + /// If this service is available the client will expose many RAM related tools such as the Hex Editor, RAM Search/Watch, and Cheats /// In addition, this is an essential service for effective lua scripting /// public interface IMemoryDomains : IEnumerable, IEmulatorService diff --git a/Dist/changelog.txt b/Dist/changelog.txt index 7b5e9517fa..1715894afa 100644 --- a/Dist/changelog.txt +++ b/Dist/changelog.txt @@ -65,9 +65,9 @@ *** Markers - adding markers updates dialog *** Don't ever remove marker 0 -**Ram Watch -Ram Watch - fix "Display watches on Screen" feature -Ram Watch - fixed saving of separators +**RAM Watch +RAM Watch - fix "Display watches on Screen" feature +RAM Watch - fixed saving of separators **Movies *** Save to Disk option (intended for large movies) @@ -76,8 +76,8 @@ Ram Watch - fixed saving of separators *** Save as menu item *** Flag for SG-1000 movies, fixes TASVideos submission parser -**Ram Search -***Fix "Exclude Ram Watch" option +**RAM Search +***Fix "Exclude RAM Watch" option ***Fix leadings zeros in the Difference and Differnet By boxes **Basic Bot @@ -102,7 +102,7 @@ Ram Watch - fixed saving of separators **Streamline editing RAM Watches **Tidy main form context menu **Add more options for U+D/L+R forbid/mutex -**Fix Ram Search, Ram Watch, Cheats recent file lists +**Fix RAM Search, RAM Watch, Cheats recent file lists **Fix ffmpeg path for AV writer broken a couple of releases ago **Add menu command to record avi skipping av writer selection **Remember codec selection between program sessions @@ -199,7 +199,7 @@ Ram Watch - fixed saving of separators **Fix Direct3D display method sleep/ctrl+alt+del crashes **Fix built-in shaders **Reduce shader level requirements for basic d3d display method functionality -**Fix Ram Search/Ram Watch recent files menu +**Fix RAM Search/RAM Watch recent files menu **Import PJM and PXM movies **Sequentially number screenshots taken in the same second without crashing after the 3rd one