From 29a0fa49f823555553e6f0d8550090548d67b71b Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 29 Nov 2013 19:55:05 +0000 Subject: [PATCH] Simplify IMovie and refactor some code to allow that, this also disables more functionality in TAStudio but it is disabled in trunk currently anyway (pending a rewrite). Also a bunch of pedantic code cleanup in tool dialogs --- BizHawk.Client.Common/movie/IMovie.cs | 93 +- BizHawk.Client.Common/movie/Movie.cs | 95 +- BizHawk.Client.Common/movie/MovieLog.cs | 2 +- BizHawk.Client.Common/movie/MovieSession.cs | 41 +- BizHawk.Client.Common/movie/Subtitle.cs | 10 +- BizHawk.Client.Common/movie/SubtitleList.cs | 11 +- BizHawk.Client.EmuHawk/MainForm.Movie.cs | 8 +- BizHawk.Client.EmuHawk/MainForm.cs | 2 +- BizHawk.Client.EmuHawk/movie/RecordMovie.cs | 52 +- BizHawk.Client.EmuHawk/tools/TAStudio.cs | 160 +- .../tools/Watch/RamPoke.Designer.cs | 2 +- BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs | 17 +- .../tools/Watch/RamSearch.Designer.cs | 2556 ++++++++--------- .../tools/Watch/RamSearch.cs | 77 +- .../tools/Watch/RamSearch.resx | 2 +- .../tools/Watch/WatchEditor.Designer.cs | 2 +- .../tools/Watch/WatchEditor.cs | 16 +- 17 files changed, 1568 insertions(+), 1578 deletions(-) diff --git a/BizHawk.Client.Common/movie/IMovie.cs b/BizHawk.Client.Common/movie/IMovie.cs index 1c77300854..8b44fc174f 100644 --- a/BizHawk.Client.Common/movie/IMovie.cs +++ b/BizHawk.Client.Common/movie/IMovie.cs @@ -3,12 +3,11 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.Common { + // TODO: message callback / event handler + // TODO: consider other event handlers, switching modes? public interface IMovie { - - int Rerecords { get; set; } - - string Filename { get; set; } + #region Status bool IsCountingRerecords { get; set; } bool IsActive { get; } @@ -17,12 +16,57 @@ namespace BizHawk.Client.Common bool IsFinished { get; } bool Changes { get; } bool Loaded { get; } + bool StartsFromSavestate { get; } + int Rerecords { get; set; } + + #endregion + + #region File Handling API + + string Filename { get; set; } bool Load(); void Save(); void SaveAs(); + + #endregion + + #region Mode Handling API + + /// + /// Tells the movie to start recording from the beginning. + /// This will clear sram, and the movie log + /// + /// + void StartNewRecording(); + + /// + /// Tells the movie to start playback from the beginning + /// This will clear sram + /// + void StartNewPlayback(); + + /// + /// Sets the movie to inactive (note that it will still be in memory) + /// The saveChanges flag will tell the movie to save its contents to disk + /// + /// void Stop(bool saveChanges = true); + /// + /// Switches to record mode + /// Does not change the movie log or clear sram + /// + void SwitchToRecord(); + + /// + /// Switches to playback mode + /// Does not change the movie log or clear sram + /// + void SwitchToPlay(); + + #endregion + #region Editing API void ClearFrame(int frame); @@ -36,39 +80,24 @@ namespace BizHawk.Client.Common #endregion #region Dubious, should reconsider - void CommitFrame(int frameNum, IController source); //why pass in frameNum? Calling api - void PokeFrame(int frameNum, string input); //Why does this exist as something different than Commit Frame? - void CaptureState(); //Movie code should manage wheter it needs to capture a state - LoadStateResult CheckTimeLines(TextReader reader, bool onlyGuid, bool ignoreGuidMismatch, out string errorMessage); //No need to return a status, no reason to have hacky flags, no need to pass a textreader - string GetTime(bool preLoad); //Rename to simply: Time, and make it a DateTime - void DumpLogIntoSavestateText(TextWriter writer); //Why pass a Textwriter, just make a string property that is the inputlog as text - void LoadLogFromSavestateText(TextReader reader, bool isMultitracking); //Pass in the text? do we need to care if it is multitracking, and can't hte movie already know that? - int? Frames { get; } //Nullable is a hack, also why does calling code need to know the number of frames, can that be minimized? - int RawFrames { get; } //Hacky to need two different frame properties + void CommitFrame(int frameNum, IController source); // Why pass in frameNum? Calling api + void PokeFrame(int frameNum, string input); // Why does this exist as something different than Commit Frame? + LoadStateResult CheckTimeLines(TextReader reader, bool onlyGuid, bool ignoreGuidMismatch, out string errorMessage); // No need to return a status, no reason to have hacky flags, no need to pass a textreader + string GetTime(bool preLoad); // Rename to simply: Time, and make it a Timespan + void DumpLogIntoSavestateText(TextWriter writer); // Why pass a Textwriter, just make a string property that is the inputlog as text + void LoadLogFromSavestateText(TextReader reader, bool isMultitracking); // Pass in the text? do we need to care if it is multitracking, and can't hte movie already know that? + int? Frames { get; } // Nullable is a hack, also why does calling code need to know the number of frames, can that be minimized? + int RawFrames { get; } // Hacky to need two different frame properties - void Finish(); //Why isn't the movie in charge of this? - void StartRecording(bool truncate = true); //Why do we need to truncate or not truncate? Why isn't the object in charge of this decision? + string GetInput(int frame); // Should be a property of a Record object - void StartPlayback(); //Poorly named for what it does, SetToPlay() perhaps? Also, this seems like too much power to give the calling code - void SwitchToRecord(); //Ditto - void SwitchToPlay(); //Dubious that it is needed + MovieHeader Header { get; } // Don't expose this!!! + MovieLog LogDump { get; } // Don't expose this!!! + SubtitleList Subtitles { get; } // Don't expose this!!! - bool FrameLagged(int frame); //SHould be a property of a Record object - byte[] GetState(int frame); //Should be a property of a Record object - string GetInput(int frame); //Should be a property of a Record object - byte[] InitState { get; } //Should be a record object? - - bool StartsFromSavestate { get; set; } //Why is this settable!!! - - MovieHeader Header { get; } //Don't expose this!!! - MovieLog LogDump { get; } //Don't expose this!!! - SubtitleList Subtitles { get; } //Don't expose this!!! - - int StateFirstIndex { get; } //What do these do? - int StateLastIndex { get; } #endregion } } -//TODO: delete this and refactor code that uses it! +// TODO: delete this and refactor code that uses it! public enum LoadStateResult { Pass, GuidMismatch, TimeLineError, FutureEventError, NotInRecording, EmptyLog, MissingFrameNumber } \ No newline at end of file diff --git a/BizHawk.Client.Common/movie/Movie.cs b/BizHawk.Client.Common/movie/Movie.cs index 95952556c5..5c99e6302d 100644 --- a/BizHawk.Client.Common/movie/Movie.cs +++ b/BizHawk.Client.Common/movie/Movie.cs @@ -11,21 +11,21 @@ namespace BizHawk.Client.Common { #region Constructors - public Movie(string filename) - : this() + public Movie(string filename, bool startsFromSavestate = false) + : this(startsFromSavestate) { Rerecords = 0; Filename = filename; Loaded = !String.IsNullOrWhiteSpace(filename); } - public Movie() + public Movie(bool startsFromSavestate = false) { Header = new MovieHeader(); Subtitles = new SubtitleList(); Filename = String.Empty; _preloadFramecount = 0; - StartsFromSavestate = false; + StartsFromSavestate = startsFromSavestate; IsCountingRerecords = true; _mode = Moviemode.Inactive; IsText = true; @@ -95,7 +95,7 @@ namespace BizHawk.Client.Common public bool StartsFromSavestate { get { return _startsfromsavestate; } - set + private set { _startsfromsavestate = value; if (value) @@ -109,17 +109,6 @@ namespace BizHawk.Client.Common } } - //TODO: these are getting too lengthy perhaps the log should just be exposed? - public int StateFirstIndex - { - get { return _log.StateFirstIndex; } - } - - public int StateLastIndex - { - get { return _log.StateLastIndex; } - } - public bool StateCapturing { get { return _statecapturing; } @@ -133,16 +122,6 @@ namespace BizHawk.Client.Common } } - public byte[] GetState(int frame) - { - return _log.GetState(frame); - } - - public byte[] InitState - { - get { return _log.InitState; } - } - #endregion #region Mode API @@ -172,11 +151,7 @@ namespace BizHawk.Client.Common get { return _changes; } } - /// - /// Tells the movie to start recording from the beginning, this will clear sram, and the movie log - /// - /// - public void StartRecording(bool truncate = true) + public void StartNewRecording() { _mode = Moviemode.Record; if (Global.Config.EnableBackupMovies && MakeBackup && _log.Length > 0) @@ -184,28 +159,20 @@ namespace BizHawk.Client.Common SaveAs(); MakeBackup = false; } - if (truncate) - { - _log.Clear(); - } + _log.Clear(); } - public void StartPlayback() + public void StartNewPlayback() { _mode = Moviemode.Play; + Global.Emulator.ClearSaveRam(); } - /// - /// Tells the movie to recording mode - /// public void SwitchToRecord() { _mode = Moviemode.Record; } - /// - /// Tells the movie to go into playback mode - /// public void SwitchToPlay() { _mode = Moviemode.Play; @@ -228,7 +195,7 @@ namespace BizHawk.Client.Common /// /// If a movie is in playback mode, this will set it to movie finished /// - public void Finish() + private void Finish() { if (_mode == Moviemode.Play) { @@ -372,30 +339,38 @@ namespace BizHawk.Client.Common public string GetInput(int frame) { - if (frame >= 0) + if (frame < _log.Length) { - int getframe; - - if (_loopOffset.HasValue) + if (frame >= 0) { - if (frame < _log.Length) + int getframe; + + if (_loopOffset.HasValue) { - getframe = frame; + if (frame < _log.Length) + { + getframe = frame; + } + else + { + getframe = ((frame - _loopOffset.Value) % (_log.Length - _loopOffset.Value)) + _loopOffset.Value; + } } else { - getframe = ((frame - _loopOffset.Value) % (_log.Length - _loopOffset.Value)) + _loopOffset.Value; + getframe = frame; } + + return _log[getframe]; } else { - getframe = frame; + return String.Empty; } - - return _log[getframe]; } else { + Finish(); return String.Empty; } } @@ -452,20 +427,6 @@ namespace BizHawk.Client.Common get { return _log; } } - public bool FrameLagged(int frame) - { - return _log.FrameLagged(frame); - } - - public void CaptureState() - { - if (StateCapturing) - { - _log.AddState(Global.Emulator.SaveStateBinary()); - GC.Collect(); - } - } - public void PokeFrame(int frameNum, string input) { _changes = true; diff --git a/BizHawk.Client.Common/movie/MovieLog.cs b/BizHawk.Client.Common/movie/MovieLog.cs index c5654cdf46..08f4a03eda 100644 --- a/BizHawk.Client.Common/movie/MovieLog.cs +++ b/BizHawk.Client.Common/movie/MovieLog.cs @@ -4,7 +4,7 @@ using System.Linq; namespace BizHawk.Client.Common { - //TODO: what is this object really trying to accomplish? COnsider making it a collection (ICollection, IEnumerable perhaps) + // TODO: what is this object really trying to accomplish? COnsider making it a collection (ICollection, IEnumerable perhaps) /// /// Represents the controller key presses of a movie diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs index 5980ec3bb7..10ce47809e 100644 --- a/BizHawk.Client.Common/movie/MovieSession.cs +++ b/BizHawk.Client.Common/movie/MovieSession.cs @@ -10,7 +10,6 @@ namespace BizHawk.Client.Common public MultitrackRecording MultiTrack = new MultitrackRecording(); public IMovie Movie; public MovieControllerAdapter MovieControllerAdapter = new MovieControllerAdapter(); - public bool EditorMode { get; set; } public Action MessageCallback; //Not Required public Func AskYesNoCallback; //Not Required @@ -65,9 +64,15 @@ namespace BizHawk.Client.Common /// public void LatchInputFromLog() { - MovieControllerAdapter.SetControllersAsMnemonic( - Movie.GetInput(Global.Emulator.Frame) - ); + var input = Movie.GetInput(Global.Emulator.Frame); + + // Attempting to get a frame past the end of a movie changes the mode to finished + if (!Movie.IsFinished) + { + MovieControllerAdapter.SetControllersAsMnemonic( + Movie.GetInput(Global.Emulator.Frame) + ); + } } public void StopMovie(bool saveChanges = true) @@ -136,29 +141,18 @@ namespace BizHawk.Client.Common else if (Movie.IsPlaying) { - if (Global.Emulator.Frame >= Movie.Frames) + + LatchInputFromLog(); + + //Movie may go into finished mode as a result from latching + if (!Movie.IsFinished) { - if (EditorMode) - { - Movie.CaptureState(); - LatchInputFromLog(); - Movie.CommitFrame(Global.Emulator.Frame, Global.MovieOutputHardpoint); - } - else - { - Movie.Finish(); - } - } - else - { - Movie.CaptureState(); - LatchInputFromLog(); if (Global.ClientControls["Scrub Input"]) { LatchInputFromPlayer(Global.MovieInputSourceAdapter); ClearFrame(); } - else if (EditorMode || Global.Config.MoviePlaybackPokeMode) + else if (Global.Config.MoviePlaybackPokeMode) { LatchInputFromPlayer(Global.MovieInputSourceAdapter); var mg = new MnemonicsGenerator(); @@ -178,7 +172,6 @@ namespace BizHawk.Client.Common else if (Movie.IsRecording) { - Movie.CaptureState(); if (MultiTrack.IsActive) { LatchMultitrackPlayerInput(Global.MovieInputSourceAdapter, Global.MultitrackRewiringControllerAdapter); @@ -430,7 +423,7 @@ namespace BizHawk.Client.Common if (result == LoadStateResult.Pass) { Global.Emulator.ClearSaveRam(); - Movie.StartRecording(); + Movie.StartNewRecording(); reader.BaseStream.Position = 0; reader.DiscardBufferedData(); Movie.LoadLogFromSavestateText(reader, MultiTrack.IsActive); @@ -446,7 +439,7 @@ namespace BizHawk.Client.Common if (newresult == LoadStateResult.Pass) { Global.Emulator.ClearSaveRam(); - Movie.StartRecording(); + Movie.StartNewRecording(); reader.BaseStream.Position = 0; reader.DiscardBufferedData(); Movie.LoadLogFromSavestateText(reader, MultiTrack.IsActive); diff --git a/BizHawk.Client.Common/movie/Subtitle.cs b/BizHawk.Client.Common/movie/Subtitle.cs index e897d36255..356d994b5c 100644 --- a/BizHawk.Client.Common/movie/Subtitle.cs +++ b/BizHawk.Client.Common/movie/Subtitle.cs @@ -34,12 +34,12 @@ namespace BizHawk.Client.Common public override string ToString() { - StringBuilder sb = new StringBuilder("subtitle "); + var sb = new StringBuilder("subtitle "); sb - .Append(Frame.ToString()).Append(" ") - .Append(X.ToString()).Append(" ") - .Append(Y.ToString()).Append(" ") - .Append(Duration.ToString()).Append(" ") + .Append(Frame).Append(" ") + .Append(X).Append(" ") + .Append(Y).Append(" ") + .Append(Duration).Append(" ") .Append(String.Format("{0:X8}", Color)).Append(" ") .Append(Message); diff --git a/BizHawk.Client.Common/movie/SubtitleList.cs b/BizHawk.Client.Common/movie/SubtitleList.cs index 3417f93bd9..1fbbc13840 100644 --- a/BizHawk.Client.Common/movie/SubtitleList.cs +++ b/BizHawk.Client.Common/movie/SubtitleList.cs @@ -1,10 +1,7 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Drawing; -using System.IO; namespace BizHawk.Client.Common { @@ -23,14 +20,14 @@ namespace BizHawk.Client.Common { var subparts = subtitleStr.Split(' '); - //Unfortunately I made the file format space delminated so this hack is necessary to get the message - string message = String.Empty; - for (int i = 6; i < subparts.Length; i++) + // Unfortunately I made the file format space delminated so this hack is necessary to get the message + var message = String.Empty; + for (var i = 6; i < subparts.Length; i++) { message += subparts[i] + ' '; } - Add(new Subtitle() + Add(new Subtitle { Frame = int.Parse(subparts[1]), X = int.Parse(subparts[2]), diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs index 24cdfb3aa5..4422da38d4 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs @@ -46,13 +46,12 @@ namespace BizHawk.Client.EmuHawk if (record) { Global.Emulator.ClearSaveRam(); - Global.MovieSession.Movie.StartRecording(); + Global.MovieSession.Movie.StartNewRecording(); Global.ReadOnly = false; } else { - Global.Emulator.ClearSaveRam(); - Global.MovieSession.Movie.StartPlayback(); + Global.MovieSession.Movie.StartNewPlayback(); } SetMainformMovieInfo(); GlobalWin.Tools.Restart(); @@ -118,8 +117,7 @@ namespace BizHawk.Client.EmuHawk LoadStateFile(Global.MovieSession.Movie.Filename, Path.GetFileName(Global.MovieSession.Movie.Filename)); Global.Emulator.ResetCounters(); } - Global.Emulator.ClearSaveRam(); - Global.MovieSession.Movie.StartPlayback(); + Global.MovieSession.Movie.StartNewPlayback(); SetMainformMovieInfo(); GlobalWin.OSD.AddMessage("Replaying movie file in read-only mode"); Global.ReadOnly = true; diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index a28b581458..564d6a4360 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -731,7 +731,7 @@ namespace BizHawk.Client.EmuHawk public void LoadTAStudio() { - Global.MovieSession.EditorMode = true; + //Global.MovieSession.EditorMode = true; GlobalWin.Tools.Load(); } diff --git a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs index 211acb571c..9b76a4bed5 100644 --- a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs +++ b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs @@ -18,8 +18,6 @@ namespace BizHawk.Client.EmuHawk //TODO //Allow relative paths in record textbox - private Movie _movieToRecord; - public RecordMovie() { InitializeComponent(); @@ -55,7 +53,6 @@ namespace BizHawk.Client.EmuHawk private void OK_Click(object sender, EventArgs e) { var path = MakePath(); - if (!String.IsNullOrWhiteSpace(path)) { var test = new FileInfo(path); @@ -68,7 +65,33 @@ namespace BizHawk.Client.EmuHawk } } - _movieToRecord = new Movie(path); + Movie _movieToRecord; + + if (StartFromCombo.SelectedItem.ToString() == "Now") + { + _movieToRecord = new Movie(path, startsFromSavestate: true); + var temppath = path; + var writer = new StreamWriter(temppath); + Global.Emulator.SaveStateText(writer); + writer.Close(); + + var file = new FileInfo(temppath); + using (var sr = file.OpenText()) + { + string str; + while ((str = sr.ReadLine()) != null) + { + if (!String.IsNullOrWhiteSpace(str)) + { + _movieToRecord.Header.Comments.Add(str); + } + } + } + } + else + { + _movieToRecord = new Movie(path); + } //Header _movieToRecord.Header.SetHeaderLine(MovieHeader.AUTHOR, AuthorBox.Text); @@ -155,27 +178,6 @@ namespace BizHawk.Client.EmuHawk } } - if (StartFromCombo.SelectedItem.ToString() == "Now") - { - _movieToRecord.StartsFromSavestate = true; - var temppath = path; - var writer = new StreamWriter(temppath); - Global.Emulator.SaveStateText(writer); - writer.Close(); - - var file = new FileInfo(temppath); - using (var sr = file.OpenText()) - { - string str; - while ((str = sr.ReadLine()) != null) - { - if (!String.IsNullOrWhiteSpace(str)) - { - _movieToRecord.Header.Comments.Add(str); - } - } - } - } GlobalWin.MainForm.StartNewMovie(_movieToRecord, true); Global.Config.UseDefaultAuthor = DefaultAuthorCheckBox.Checked; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio.cs index 49e94616ad..cfaf12c92d 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio.cs @@ -90,27 +90,27 @@ namespace BizHawk.Client.EmuHawk private void TASView_QueryItemBkColor(int index, int column, ref Color color) { - if (index == 0 && Global.MovieSession.Movie.StateFirstIndex == 0) - { - if (color != Color.LightGreen) - { - color = Color.LightGreen; //special case for frame 0. Normally we need to go back an extra frame, but for frame 0 we can reload the rom. - } - } - else if (Global.MovieSession.Movie.FrameLagged(index)) - { - if (color != Color.Pink) - { - color = Color.Pink; - } - } - else if (index > Global.MovieSession.Movie.StateFirstIndex && index <= Global.MovieSession.Movie.StateLastIndex) - { - if (color != Color.LightGreen) - { - color = Color.LightGreen; - } - } + //if (index == 0 && Global.MovieSession.Movie.StateFirstIndex == 0) + //{ + // if (color != Color.LightGreen) + // { + // color = Color.LightGreen; //special case for frame 0. Normally we need to go back an extra frame, but for frame 0 we can reload the rom. + // } + //} + //else if (Global.MovieSession.Movie.FrameLagged(index)) + //{ + // if (color != Color.Pink) + // { + // color = Color.Pink; + // } + //} + //else if (index > Global.MovieSession.Movie.StateFirstIndex && index <= Global.MovieSession.Movie.StateLastIndex) + //{ + // if (color != Color.LightGreen) + // { + // color = Color.LightGreen; + // } + //} if (index == Global.Emulator.Frame) { if (color != Color.LightBlue) @@ -137,11 +137,11 @@ namespace BizHawk.Client.EmuHawk private void DisplayList() { TASView.ItemCount = Global.MovieSession.Movie.RawFrames; - if (Global.MovieSession.Movie.Frames == Global.Emulator.Frame && Global.MovieSession.Movie.StateLastIndex == Global.Emulator.Frame - 1) - { - //If we're at the end of the movie add one to show the cursor as a blank frame - TASView.ItemCount++; - } + //if (Global.MovieSession.Movie.Frames == Global.Emulator.Frame && Global.MovieSession.Movie.StateLastIndex == Global.Emulator.Frame - 1) + //{ + // //If we're at the end of the movie add one to show the cursor as a blank frame + // TASView.ItemCount++; + //} TASView.ensureVisible(Global.Emulator.Frame - 1); } @@ -415,17 +415,17 @@ namespace BizHawk.Client.EmuHawk private void TASView_DoubleClick(object sender, EventArgs e) { - if (TASView.selectedItem <= Global.MovieSession.Movie.StateLastIndex) - { - stopOnFrame = 0; - RewindToFrame(TASView.selectedItem); - } - else - { - RewindToFrame(Global.MovieSession.Movie.StateLastIndex); - stopOnFrame = TASView.selectedItem; - GlobalWin.MainForm.PressFrameAdvance = true; - } + //if (TASView.selectedItem <= Global.MovieSession.Movie.StateLastIndex) + //{ + // stopOnFrame = 0; + // RewindToFrame(TASView.selectedItem); + //} + //else + //{ + // RewindToFrame(Global.MovieSession.Movie.StateLastIndex); + // stopOnFrame = TASView.selectedItem; + // GlobalWin.MainForm.PressFrameAdvance = true; + //} UpdateValues(); } @@ -540,54 +540,54 @@ namespace BizHawk.Client.EmuHawk } else if (frame <= Global.Emulator.Frame) { - if (frame <= Global.MovieSession.Movie.StateFirstIndex) - { - Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.InitState))); - if (Global.MovieSession.Movie.IsRecording) - { - Global.MovieSession.Movie.StartPlayback(); - GlobalWin.MainForm.RestoreReadWriteOnStop = true; - } - } - else - { - if (frame == 0) - { - Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.InitState))); - } - else - { - //frame-1 because we need to go back an extra frame and then run a frame, otherwise the display doesn't get updated. - Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.GetState(frame - 1)))); - GlobalWin.MainForm.UpdateFrame = true; - } - } - } - else if (frame <= Global.MovieSession.Movie.StateLastIndex) - { - Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.GetState(frame - 1)))); - GlobalWin.MainForm.UpdateFrame = true; - } - else - { - GlobalWin.MainForm.UnpauseEmulator(); + //if (frame <= Global.MovieSession.Movie.StateFirstIndex) + //{ + // Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.InitState))); + // if (Global.MovieSession.Movie.IsRecording) + // { + // Global.MovieSession.Movie.StartPlayback(); + // GlobalWin.MainForm.RestoreReadWriteOnStop = true; + // } + //} + //else + //{ + // if (frame == 0) + // { + // Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.InitState))); + // } + // else + // { + // //frame-1 because we need to go back an extra frame and then run a frame, otherwise the display doesn't get updated. + // Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.GetState(frame - 1)))); + // GlobalWin.MainForm.UpdateFrame = true; + // } + //} } + //else if (frame <= Global.MovieSession.Movie.StateLastIndex) + //{ + // Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.GetState(frame - 1)))); + // GlobalWin.MainForm.UpdateFrame = true; + //} + //else + //{ + // GlobalWin.MainForm.UnpauseEmulator(); + //} } public void DeleteFrame(int frame) { - if (frame <= Global.MovieSession.Movie.StateLastIndex) - { - if (frame <= Global.MovieSession.Movie.StateFirstIndex) - { - RewindToFrame(0); - } - else - { - RewindToFrame(frame); - } - } - Global.MovieSession.Movie.DeleteFrame(frame); + //if (frame <= Global.MovieSession.Movie.StateLastIndex) + //{ + // if (frame <= Global.MovieSession.Movie.StateFirstIndex) + // { + // RewindToFrame(0); + // } + // else + // { + // RewindToFrame(frame); + // } + //} + //Global.MovieSession.Movie.DeleteFrame(frame); } private void DeleteFrames() diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs index d1a75b1d6d..59a681edec 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.Designer.cs @@ -65,7 +65,7 @@ this.OK.TabIndex = 35; this.OK.Text = "&Poke"; this.OK.UseVisualStyleBackColor = true; - this.OK.Click += new System.EventHandler(this.OK_Click); + this.OK.Click += new System.EventHandler(this.Ok_Click); // // Cancel // diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs index c1a1120539..9f82d4638b 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs @@ -10,8 +10,7 @@ namespace BizHawk.Client.EmuHawk { public partial class RamPoke : Form { - //TODO: don't use textboxes as labels - + // TODO: don't use textboxes as labels private List _watchList = new List(); public Point InitialLocation = new Point(0, 0); @@ -34,7 +33,7 @@ namespace BizHawk.Client.EmuHawk private void RamPoke_Load(object sender, EventArgs e) { - _watchList = _watchList.Where(x => !x.IsSeparator).ToList(); //Weed out separators just in case + _watchList = _watchList.Where(x => !x.IsSeparator).ToList(); // Weed out separators just in case if (_watchList.Count == 0) { @@ -58,10 +57,11 @@ namespace BizHawk.Client.EmuHawk UnSupportedConfiguration(); } } + AddressBox.SetHexProperties(_watchList[0].Domain.Size); AddressBox.Text = _watchList.Select(a => a.AddressString).Distinct().Aggregate((addrStr, nextStr) => addrStr + ("," + nextStr)); ValueHexLabel.Text = _watchList[0].Type == Watch.DisplayType.Hex ? "0x" : String.Empty; - ValueBox.Text = _watchList[0].ValueString.Replace(" ", ""); + ValueBox.Text = _watchList[0].ValueString.Replace(" ", String.Empty); DomainLabel.Text = _watchList[0].Domain.Name; SizeLabel.Text = _watchList[0].Size.ToString(); DisplayTypeLabel.Text = Watch.DisplayTypeToString(_watchList[0].Type); @@ -83,14 +83,9 @@ namespace BizHawk.Client.EmuHawk Close(); } - private void OK_Click(object sender, EventArgs e) + private void Ok_Click(object sender, EventArgs e) { - var success = true; - foreach (var watch in _watchList.Where(watch => !watch.Poke(ValueBox.Text))) - { - success = false; - } - + var success = _watchList.All(watch => watch.Poke(ValueBox.Text)); OutputLabel.Text = success ? "Value successfully written." : "An error occured when writing Value."; } diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs index a1e2b4ec8f..7a0c6f009d 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs @@ -28,222 +28,222 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.Windows.Forms.ToolStripMenuItem SearchMenuItem; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RamSearch)); - this.TotalSearchLabel = new System.Windows.Forms.Label(); - this.WatchListView = new BizHawk.Client.EmuHawk.VirtualListView(); - this.AddressColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.ValueColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.PreviousColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.ChangesColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.DiffColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.DoSearchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.NewSearchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ContextMenuSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.RemoveContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AddToRamWatchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PokeContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FreezeContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.UnfreezeAllContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ContextMenuSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.ViewInHexEditorContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ContextMenuSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.ClearPreviewContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.menuStrip1 = new MenuStripEx(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OpenMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveAsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AppendFileMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TruncateFromFileMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RecentSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.modeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DetailedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FastMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MemoryDomainsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.sizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this._1ByteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this._2ByteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this._4ByteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CheckMisalignedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.BigEndianMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DisplayTypeSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.DefinePreviousValueSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.Previous_LastSearchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PreviousFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Previous_OriginalMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.newSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); - this.UndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RedoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CopyValueToPrevMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ClearChangeCountsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RemoveMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.GoToAddressMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AddToRamWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PokeAddressMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FreezeAddressMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); - this.ClearUndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PreviewModeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AutoSearchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - this.ExcludeRamWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.UseUndoHistoryMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); - this.AutoloadDialogMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveWinPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.RestoreDefaultsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ColumnsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShowPreviousMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShowChangesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShowDiffMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MemDomainLabel = new System.Windows.Forms.Label(); - this.MessageLabel = new System.Windows.Forms.Label(); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.AutoSearchCheckBox = new System.Windows.Forms.CheckBox(); - this.CompareToBox = new System.Windows.Forms.GroupBox(); - this.DifferenceBox = new BizHawk.Client.EmuHawk.UnsignedIntegerBox(); - this.DifferenceRadio = new System.Windows.Forms.RadioButton(); - this.NumberOfChangesBox = new BizHawk.Client.EmuHawk.UnsignedIntegerBox(); - this.SpecificAddressBox = new BizHawk.Client.EmuHawk.HexTextBox(); - this.SpecificValueBox = new BizHawk.Client.EmuHawk.WatchValueBox(); - this.NumberOfChangesRadio = new System.Windows.Forms.RadioButton(); - this.SpecificAddressRadio = new System.Windows.Forms.RadioButton(); - this.SpecificValueRadio = new System.Windows.Forms.RadioButton(); - this.PreviousValueRadio = new System.Windows.Forms.RadioButton(); - this.toolStrip1 = new ToolStripEx(); - this.DoSearchToolButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); - this.NewSearchToolButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); - this.CopyValueToPrevToolBarItem = new System.Windows.Forms.ToolStripButton(); - this.ClearChangeCountsToolBarItem = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); - this.RemoveToolBarItem = new System.Windows.Forms.ToolStripButton(); - this.AddToRamWatchToolBarItem = new System.Windows.Forms.ToolStripButton(); - this.PokeAddressToolBarItem = new System.Windows.Forms.ToolStripButton(); - this.FreezeAddressToolBarItem = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); - this.UndoToolBarButton = new System.Windows.Forms.ToolStripButton(); - this.RedoToolBarItem = new System.Windows.Forms.ToolStripButton(); - this.RebootToolBarSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.RebootToolbarButton = new System.Windows.Forms.ToolStripButton(); - this.ComparisonBox = new System.Windows.Forms.GroupBox(); - this.DifferentByBox = new BizHawk.Client.EmuHawk.UnsignedIntegerBox(); - this.DifferentByRadio = new System.Windows.Forms.RadioButton(); - this.NotEqualToRadio = new System.Windows.Forms.RadioButton(); - this.EqualToRadio = new System.Windows.Forms.RadioButton(); - this.GreaterThanOrEqualToRadio = new System.Windows.Forms.RadioButton(); - this.LessThanOrEqualToRadio = new System.Windows.Forms.RadioButton(); - this.GreaterThanRadio = new System.Windows.Forms.RadioButton(); - this.LessThanRadio = new System.Windows.Forms.RadioButton(); - this.SearchButton = new System.Windows.Forms.Button(); - this.SizeDropdown = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.DisplayTypeDropdown = new System.Windows.Forms.ComboBox(); - SearchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.contextMenuStrip1.SuspendLayout(); - this.menuStrip1.SuspendLayout(); - this.CompareToBox.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.ComparisonBox.SuspendLayout(); - this.SuspendLayout(); - // - // SearchMenuItem - // - SearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; - SearchMenuItem.Name = "SearchMenuItem"; - SearchMenuItem.Size = new System.Drawing.Size(215, 22); - SearchMenuItem.Text = "&Search"; - SearchMenuItem.Click += new System.EventHandler(this.SearchMenuItem_Click); - // - // TotalSearchLabel - // - this.TotalSearchLabel.AutoSize = true; - this.TotalSearchLabel.Location = new System.Drawing.Point(12, 49); - this.TotalSearchLabel.Name = "TotalSearchLabel"; - this.TotalSearchLabel.Size = new System.Drawing.Size(64, 13); - this.TotalSearchLabel.TabIndex = 2; - this.TotalSearchLabel.Text = "0 addresses"; - // - // WatchListView - // - this.WatchListView.AllowColumnReorder = true; - this.WatchListView.AllowDrop = true; - this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.ToolStripMenuItem SearchMenuItem; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RamSearch)); + this.TotalSearchLabel = new System.Windows.Forms.Label(); + this.WatchListView = new BizHawk.Client.EmuHawk.VirtualListView(); + this.AddressColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.ValueColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.PreviousColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.ChangesColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.DiffColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.ListViewContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.DoSearchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.NewSearchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ContextMenuSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.RemoveContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AddToRamWatchContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PokeContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FreezeContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.UnfreezeAllContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ContextMenuSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.ViewInHexEditorContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ContextMenuSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.ClearPreviewContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1 = new MenuStripEx(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OpenMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveAsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AppendFileMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.TruncateFromFileMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RecentSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.modeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DetailedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FastMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MemoryDomainsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.sizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ByteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.WordMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DWordMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CheckMisalignedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.BigEndianMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DisplayTypeSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.DefinePreviousValueSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.Previous_LastSearchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PreviousFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.Previous_OriginalMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); + this.UndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RedoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CopyValueToPrevMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ClearChangeCountsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RemoveMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.GoToAddressMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AddToRamWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PokeAddressMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FreezeAddressMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); + this.ClearUndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PreviewModeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AutoSearchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.ExcludeRamWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.UseUndoHistoryMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); + this.AutoloadDialogMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveWinPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.RestoreDefaultsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ColumnsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ShowPreviousMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ShowChangesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ShowDiffMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MemDomainLabel = new System.Windows.Forms.Label(); + this.MessageLabel = new System.Windows.Forms.Label(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.AutoSearchCheckBox = new System.Windows.Forms.CheckBox(); + this.CompareToBox = new System.Windows.Forms.GroupBox(); + this.DifferenceBox = new BizHawk.Client.EmuHawk.UnsignedIntegerBox(); + this.DifferenceRadio = new System.Windows.Forms.RadioButton(); + this.NumberOfChangesBox = new BizHawk.Client.EmuHawk.UnsignedIntegerBox(); + this.SpecificAddressBox = new BizHawk.Client.EmuHawk.HexTextBox(); + this.SpecificValueBox = new BizHawk.Client.EmuHawk.WatchValueBox(); + this.NumberOfChangesRadio = new System.Windows.Forms.RadioButton(); + this.SpecificAddressRadio = new System.Windows.Forms.RadioButton(); + this.SpecificValueRadio = new System.Windows.Forms.RadioButton(); + this.PreviousValueRadio = new System.Windows.Forms.RadioButton(); + this.toolStrip1 = new ToolStripEx(); + this.DoSearchToolButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); + this.NewSearchToolButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); + this.CopyValueToPrevToolBarItem = new System.Windows.Forms.ToolStripButton(); + this.ClearChangeCountsToolBarItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); + this.RemoveToolBarItem = new System.Windows.Forms.ToolStripButton(); + this.AddToRamWatchToolBarItem = new System.Windows.Forms.ToolStripButton(); + this.PokeAddressToolBarItem = new System.Windows.Forms.ToolStripButton(); + this.FreezeAddressToolBarItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); + this.UndoToolBarButton = new System.Windows.Forms.ToolStripButton(); + this.RedoToolBarItem = new System.Windows.Forms.ToolStripButton(); + this.RebootToolBarSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.RebootToolbarButton = new System.Windows.Forms.ToolStripButton(); + this.ComparisonBox = new System.Windows.Forms.GroupBox(); + this.DifferentByBox = new BizHawk.Client.EmuHawk.UnsignedIntegerBox(); + this.DifferentByRadio = new System.Windows.Forms.RadioButton(); + this.NotEqualToRadio = new System.Windows.Forms.RadioButton(); + this.EqualToRadio = new System.Windows.Forms.RadioButton(); + this.GreaterThanOrEqualToRadio = new System.Windows.Forms.RadioButton(); + this.LessThanOrEqualToRadio = new System.Windows.Forms.RadioButton(); + this.GreaterThanRadio = new System.Windows.Forms.RadioButton(); + this.LessThanRadio = new System.Windows.Forms.RadioButton(); + this.SearchButton = new System.Windows.Forms.Button(); + this.SizeDropdown = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.DisplayTypeDropdown = new System.Windows.Forms.ComboBox(); + SearchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ListViewContextMenu.SuspendLayout(); + this.menuStrip1.SuspendLayout(); + this.CompareToBox.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.ComparisonBox.SuspendLayout(); + this.SuspendLayout(); + // + // SearchMenuItem + // + SearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; + SearchMenuItem.Name = "SearchMenuItem"; + SearchMenuItem.Size = new System.Drawing.Size(215, 22); + SearchMenuItem.Text = "&Search"; + SearchMenuItem.Click += new System.EventHandler(this.SearchMenuItem_Click); + // + // TotalSearchLabel + // + this.TotalSearchLabel.AutoSize = true; + this.TotalSearchLabel.Location = new System.Drawing.Point(12, 49); + this.TotalSearchLabel.Name = "TotalSearchLabel"; + this.TotalSearchLabel.Size = new System.Drawing.Size(64, 13); + this.TotalSearchLabel.TabIndex = 2; + this.TotalSearchLabel.Text = "0 addresses"; + // + // WatchListView + // + this.WatchListView.AllowColumnReorder = true; + this.WatchListView.AllowDrop = true; + this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.WatchListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.WatchListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.AddressColumn, this.ValueColumn, this.PreviousColumn, this.ChangesColumn, this.DiffColumn}); - this.WatchListView.ContextMenuStrip = this.contextMenuStrip1; - this.WatchListView.FullRowSelect = true; - this.WatchListView.GridLines = true; - this.WatchListView.HideSelection = false; - this.WatchListView.ItemCount = 0; - this.WatchListView.Location = new System.Drawing.Point(9, 65); - this.WatchListView.Name = "WatchListView"; - this.WatchListView.selectedItem = -1; - this.WatchListView.Size = new System.Drawing.Size(230, 366); - this.WatchListView.TabIndex = 1; - this.WatchListView.UseCompatibleStateImageBehavior = false; - this.WatchListView.View = System.Windows.Forms.View.Details; - this.WatchListView.VirtualMode = true; - this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick); - this.WatchListView.ColumnReordered += new System.Windows.Forms.ColumnReorderedEventHandler(this.WatchListView_ColumnReordered); - this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged); - this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragDrop); - this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragEnter); - this.WatchListView.Enter += new System.EventHandler(this.WatchListView_Enter); - this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown); - this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick); - // - // AddressColumn - // - this.AddressColumn.Text = "Address"; - this.AddressColumn.Width = 61; - // - // ValueColumn - // - this.ValueColumn.Text = "Value"; - this.ValueColumn.Width = 48; - // - // PreviousColumn - // - this.PreviousColumn.Text = "Prev"; - this.PreviousColumn.Width = 48; - // - // ChangesColumn - // - this.ChangesColumn.Text = "Changes"; - this.ChangesColumn.Width = 55; - // - // DiffColumn - // - this.DiffColumn.Text = "Diff"; - // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.WatchListView.ContextMenuStrip = this.ListViewContextMenu; + this.WatchListView.FullRowSelect = true; + this.WatchListView.GridLines = true; + this.WatchListView.HideSelection = false; + this.WatchListView.ItemCount = 0; + this.WatchListView.Location = new System.Drawing.Point(9, 65); + this.WatchListView.Name = "WatchListView"; + this.WatchListView.selectedItem = -1; + this.WatchListView.Size = new System.Drawing.Size(230, 366); + this.WatchListView.TabIndex = 1; + this.WatchListView.UseCompatibleStateImageBehavior = false; + this.WatchListView.View = System.Windows.Forms.View.Details; + this.WatchListView.VirtualMode = true; + this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick); + this.WatchListView.ColumnReordered += new System.Windows.Forms.ColumnReorderedEventHandler(this.WatchListView_ColumnReordered); + this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged); + this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragDrop); + this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragEnter); + this.WatchListView.Enter += new System.EventHandler(this.WatchListView_Enter); + this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown); + this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick); + // + // AddressColumn + // + this.AddressColumn.Text = "Address"; + this.AddressColumn.Width = 61; + // + // ValueColumn + // + this.ValueColumn.Text = "Value"; + this.ValueColumn.Width = 48; + // + // PreviousColumn + // + this.PreviousColumn.Text = "Prev"; + this.PreviousColumn.Width = 48; + // + // ChangesColumn + // + this.ChangesColumn.Text = "Changes"; + this.ChangesColumn.Width = 55; + // + // DiffColumn + // + this.DiffColumn.Text = "Diff"; + // + // ListViewContextMenu + // + this.ListViewContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DoSearchContextMenuItem, this.NewSearchContextMenuItem, this.ContextMenuSeparator1, @@ -256,117 +256,117 @@ this.ViewInHexEditorContextMenuItem, this.ContextMenuSeparator3, this.ClearPreviewContextMenuItem}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(216, 220); - this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); - // - // DoSearchContextMenuItem - // - this.DoSearchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; - this.DoSearchContextMenuItem.Name = "DoSearchContextMenuItem"; - this.DoSearchContextMenuItem.Size = new System.Drawing.Size(215, 22); - this.DoSearchContextMenuItem.Text = "&Search"; - this.DoSearchContextMenuItem.Click += new System.EventHandler(this.SearchMenuItem_Click); - // - // NewSearchContextMenuItem - // - this.NewSearchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; - this.NewSearchContextMenuItem.Name = "NewSearchContextMenuItem"; - this.NewSearchContextMenuItem.Size = new System.Drawing.Size(215, 22); - this.NewSearchContextMenuItem.Text = "&Start New Search"; - this.NewSearchContextMenuItem.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click); - // - // ContextMenuSeparator1 - // - this.ContextMenuSeparator1.Name = "ContextMenuSeparator1"; - this.ContextMenuSeparator1.Size = new System.Drawing.Size(212, 6); - // - // RemoveContextMenuItem - // - this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; - this.RemoveContextMenuItem.Name = "RemoveContextMenuItem"; - this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Del"; - this.RemoveContextMenuItem.Size = new System.Drawing.Size(215, 22); - this.RemoveContextMenuItem.Text = "Remove Selected"; - this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveMenuItem_Click); - // - // AddToRamWatchContextMenuItem - // - this.AddToRamWatchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; - 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.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); - // - // PokeContextMenuItem - // - this.PokeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; - this.PokeContextMenuItem.Name = "PokeContextMenuItem"; - this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P"; - this.PokeContextMenuItem.Size = new System.Drawing.Size(215, 22); - this.PokeContextMenuItem.Text = "Poke Address"; - this.PokeContextMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); - // - // FreezeContextMenuItem - // - this.FreezeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; - this.FreezeContextMenuItem.Name = "FreezeContextMenuItem"; - this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F"; - this.FreezeContextMenuItem.Size = new System.Drawing.Size(215, 22); - this.FreezeContextMenuItem.Text = "Freeze Address"; - this.FreezeContextMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); - // - // UnfreezeAllContextMenuItem - // - this.UnfreezeAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze; - this.UnfreezeAllContextMenuItem.Name = "UnfreezeAllContextMenuItem"; - this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(215, 22); - this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All"; - this.UnfreezeAllContextMenuItem.Click += new System.EventHandler(this.UnfreezeAllContextMenuItem_Click); - // - // ContextMenuSeparator2 - // - this.ContextMenuSeparator2.Name = "ContextMenuSeparator2"; - this.ContextMenuSeparator2.Size = new System.Drawing.Size(212, 6); - // - // ViewInHexEditorContextMenuItem - // - this.ViewInHexEditorContextMenuItem.Name = "ViewInHexEditorContextMenuItem"; - this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(215, 22); - this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor"; - this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click); - // - // ContextMenuSeparator3 - // - this.ContextMenuSeparator3.Name = "ContextMenuSeparator3"; - this.ContextMenuSeparator3.Size = new System.Drawing.Size(212, 6); - // - // ClearPreviewContextMenuItem - // - this.ClearPreviewContextMenuItem.Name = "ClearPreviewContextMenuItem"; - this.ClearPreviewContextMenuItem.Size = new System.Drawing.Size(215, 22); - this.ClearPreviewContextMenuItem.Text = "&Clear Preview"; - this.ClearPreviewContextMenuItem.Click += new System.EventHandler(this.ClearPreviewContextMenuItem_Click); - // - // menuStrip1 - // - this.menuStrip1.ClickThrough = true; - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ListViewContextMenu.Name = "contextMenuStrip1"; + this.ListViewContextMenu.Size = new System.Drawing.Size(216, 242); + this.ListViewContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ListViewContextMenu_Opening); + // + // DoSearchContextMenuItem + // + this.DoSearchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; + this.DoSearchContextMenuItem.Name = "DoSearchContextMenuItem"; + this.DoSearchContextMenuItem.Size = new System.Drawing.Size(215, 22); + this.DoSearchContextMenuItem.Text = "&Search"; + this.DoSearchContextMenuItem.Click += new System.EventHandler(this.SearchMenuItem_Click); + // + // NewSearchContextMenuItem + // + this.NewSearchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; + this.NewSearchContextMenuItem.Name = "NewSearchContextMenuItem"; + this.NewSearchContextMenuItem.Size = new System.Drawing.Size(215, 22); + this.NewSearchContextMenuItem.Text = "&Start New Search"; + this.NewSearchContextMenuItem.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click); + // + // ContextMenuSeparator1 + // + this.ContextMenuSeparator1.Name = "ContextMenuSeparator1"; + this.ContextMenuSeparator1.Size = new System.Drawing.Size(212, 6); + // + // RemoveContextMenuItem + // + this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; + this.RemoveContextMenuItem.Name = "RemoveContextMenuItem"; + this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Del"; + this.RemoveContextMenuItem.Size = new System.Drawing.Size(215, 22); + this.RemoveContextMenuItem.Text = "Remove Selected"; + this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveMenuItem_Click); + // + // AddToRamWatchContextMenuItem + // + this.AddToRamWatchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; + 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.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); + // + // PokeContextMenuItem + // + this.PokeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; + this.PokeContextMenuItem.Name = "PokeContextMenuItem"; + this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P"; + this.PokeContextMenuItem.Size = new System.Drawing.Size(215, 22); + this.PokeContextMenuItem.Text = "Poke Address"; + this.PokeContextMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); + // + // FreezeContextMenuItem + // + this.FreezeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; + this.FreezeContextMenuItem.Name = "FreezeContextMenuItem"; + this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F"; + this.FreezeContextMenuItem.Size = new System.Drawing.Size(215, 22); + this.FreezeContextMenuItem.Text = "Freeze Address"; + this.FreezeContextMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); + // + // UnfreezeAllContextMenuItem + // + this.UnfreezeAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze; + this.UnfreezeAllContextMenuItem.Name = "UnfreezeAllContextMenuItem"; + this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(215, 22); + this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All"; + this.UnfreezeAllContextMenuItem.Click += new System.EventHandler(this.UnfreezeAllContextMenuItem_Click); + // + // ContextMenuSeparator2 + // + this.ContextMenuSeparator2.Name = "ContextMenuSeparator2"; + this.ContextMenuSeparator2.Size = new System.Drawing.Size(212, 6); + // + // ViewInHexEditorContextMenuItem + // + this.ViewInHexEditorContextMenuItem.Name = "ViewInHexEditorContextMenuItem"; + this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(215, 22); + this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor"; + this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click); + // + // ContextMenuSeparator3 + // + this.ContextMenuSeparator3.Name = "ContextMenuSeparator3"; + this.ContextMenuSeparator3.Size = new System.Drawing.Size(212, 6); + // + // ClearPreviewContextMenuItem + // + this.ClearPreviewContextMenuItem.Name = "ClearPreviewContextMenuItem"; + this.ClearPreviewContextMenuItem.Size = new System.Drawing.Size(215, 22); + this.ClearPreviewContextMenuItem.Text = "&Clear Preview"; + this.ClearPreviewContextMenuItem.Click += new System.EventHandler(this.ClearPreviewContextMenuItem_Click); + // + // menuStrip1 + // + this.menuStrip1.ClickThrough = true; + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.settingsToolStripMenuItem, this.searchToolStripMenuItem, this.optionsToolStripMenuItem, this.ColumnsMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(445, 24); - this.menuStrip1.TabIndex = 4; - this.menuStrip1.Text = "menuStrip1"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(445, 24); + this.menuStrip1.TabIndex = 4; + this.menuStrip1.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.OpenMenuItem, this.SaveMenuItem, this.SaveAsMenuItem, @@ -375,84 +375,84 @@ this.RecentSubMenu, this.toolStripSeparator4, this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); - this.fileToolStripMenuItem.Text = "&File"; - this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); - // - // OpenMenuItem - // - this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; - this.OpenMenuItem.Name = "OpenMenuItem"; - this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.OpenMenuItem.Size = new System.Drawing.Size(195, 22); - this.OpenMenuItem.Text = "&Open..."; - this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); - // - // SaveMenuItem - // - this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; - this.SaveMenuItem.Name = "SaveMenuItem"; - this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.SaveMenuItem.Size = new System.Drawing.Size(195, 22); - this.SaveMenuItem.Text = "&Save"; - this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click); - // - // SaveAsMenuItem - // - this.SaveAsMenuItem.Name = "SaveAsMenuItem"; - this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Text = "&File"; + this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); + // + // OpenMenuItem + // + this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; + this.OpenMenuItem.Name = "OpenMenuItem"; + this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.OpenMenuItem.Size = new System.Drawing.Size(195, 22); + this.OpenMenuItem.Text = "&Open..."; + this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); + // + // SaveMenuItem + // + this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; + this.SaveMenuItem.Name = "SaveMenuItem"; + this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.SaveMenuItem.Size = new System.Drawing.Size(195, 22); + this.SaveMenuItem.Text = "&Save"; + this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click); + // + // SaveAsMenuItem + // + this.SaveAsMenuItem.Name = "SaveAsMenuItem"; + this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22); - this.SaveAsMenuItem.Text = "Save As..."; - this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click); - // - // AppendFileMenuItem - // - this.AppendFileMenuItem.Name = "AppendFileMenuItem"; - this.AppendFileMenuItem.Size = new System.Drawing.Size(195, 22); - this.AppendFileMenuItem.Text = "&Append File..."; - this.AppendFileMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); - // - // TruncateFromFileMenuItem - // - this.TruncateFromFileMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TruncateFromFile; - this.TruncateFromFileMenuItem.Name = "TruncateFromFileMenuItem"; - this.TruncateFromFileMenuItem.Size = new System.Drawing.Size(195, 22); - this.TruncateFromFileMenuItem.Text = "&Truncate from File..."; - this.TruncateFromFileMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); - // - // RecentSubMenu - // - this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22); + this.SaveAsMenuItem.Text = "Save As..."; + this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click); + // + // AppendFileMenuItem + // + this.AppendFileMenuItem.Name = "AppendFileMenuItem"; + this.AppendFileMenuItem.Size = new System.Drawing.Size(195, 22); + this.AppendFileMenuItem.Text = "&Append File..."; + this.AppendFileMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); + // + // TruncateFromFileMenuItem + // + this.TruncateFromFileMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TruncateFromFile; + this.TruncateFromFileMenuItem.Name = "TruncateFromFileMenuItem"; + this.TruncateFromFileMenuItem.Size = new System.Drawing.Size(195, 22); + this.TruncateFromFileMenuItem.Text = "&Truncate from File..."; + this.TruncateFromFileMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); + // + // RecentSubMenu + // + this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator2}); - this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; - this.RecentSubMenu.Name = "RecentSubMenu"; - this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); - this.RecentSubMenu.Text = "Recent"; - this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(57, 6); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(192, 6); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.exitToolStripMenuItem.Text = "&Close"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.CloseMenuItem_Click); - // - // settingsToolStripMenuItem - // - this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; + this.RecentSubMenu.Name = "RecentSubMenu"; + this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); + this.RecentSubMenu.Text = "Recent"; + this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(57, 6); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(192, 6); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.exitToolStripMenuItem.Text = "&Close"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.CloseMenuItem_Click); + // + // settingsToolStripMenuItem + // + this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.modeToolStripMenuItem, this.MemoryDomainsSubMenu, this.sizeToolStripMenuItem, @@ -461,149 +461,149 @@ this.BigEndianMenuItem, this.DisplayTypeSubMenu, this.DefinePreviousValueSubMenu}); - this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); - this.settingsToolStripMenuItem.Text = "&Settings"; - this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened); - // - // modeToolStripMenuItem - // - this.modeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); + this.settingsToolStripMenuItem.Text = "&Settings"; + this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened); + // + // modeToolStripMenuItem + // + this.modeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DetailedMenuItem, this.FastMenuItem}); - this.modeToolStripMenuItem.Name = "modeToolStripMenuItem"; - this.modeToolStripMenuItem.Size = new System.Drawing.Size(188, 22); - this.modeToolStripMenuItem.Text = "&Mode"; - this.modeToolStripMenuItem.DropDownOpened += new System.EventHandler(this.ModeSubMenu_DropDownOpened); - // - // DetailedMenuItem - // - this.DetailedMenuItem.Name = "DetailedMenuItem"; - this.DetailedMenuItem.Size = new System.Drawing.Size(117, 22); - this.DetailedMenuItem.Text = "&Detailed"; - this.DetailedMenuItem.Click += new System.EventHandler(this.DetailedMenuItem_Click); - // - // FastMenuItem - // - this.FastMenuItem.Name = "FastMenuItem"; - this.FastMenuItem.Size = new System.Drawing.Size(117, 22); - this.FastMenuItem.Text = "&Fast"; - this.FastMenuItem.Click += new System.EventHandler(this.FastMenuItem_Click); - // - // MemoryDomainsSubMenu - // - this.MemoryDomainsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.modeToolStripMenuItem.Name = "modeToolStripMenuItem"; + this.modeToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.modeToolStripMenuItem.Text = "&Mode"; + this.modeToolStripMenuItem.DropDownOpened += new System.EventHandler(this.ModeSubMenu_DropDownOpened); + // + // DetailedMenuItem + // + this.DetailedMenuItem.Name = "DetailedMenuItem"; + this.DetailedMenuItem.Size = new System.Drawing.Size(117, 22); + this.DetailedMenuItem.Text = "&Detailed"; + this.DetailedMenuItem.Click += new System.EventHandler(this.DetailedMenuItem_Click); + // + // FastMenuItem + // + this.FastMenuItem.Name = "FastMenuItem"; + this.FastMenuItem.Size = new System.Drawing.Size(117, 22); + this.FastMenuItem.Text = "&Fast"; + this.FastMenuItem.Click += new System.EventHandler(this.FastMenuItem_Click); + // + // MemoryDomainsSubMenu + // + this.MemoryDomainsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator6}); - this.MemoryDomainsSubMenu.Name = "MemoryDomainsSubMenu"; - this.MemoryDomainsSubMenu.Size = new System.Drawing.Size(188, 22); - this.MemoryDomainsSubMenu.Text = "&Memory Domains"; - this.MemoryDomainsSubMenu.DropDownOpened += new System.EventHandler(this.MemoryDomainsSubMenu_DropDownOpened); - // - // toolStripSeparator6 - // - this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(57, 6); - // - // sizeToolStripMenuItem - // - this.sizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this._1ByteMenuItem, - this._2ByteMenuItem, - this._4ByteMenuItem}); - this.sizeToolStripMenuItem.Name = "sizeToolStripMenuItem"; - this.sizeToolStripMenuItem.Size = new System.Drawing.Size(188, 22); - this.sizeToolStripMenuItem.Text = "&Size"; - this.sizeToolStripMenuItem.DropDownOpened += new System.EventHandler(this.SizeSubMenu_DropDownOpened); - // - // _1ByteMenuItem - // - this._1ByteMenuItem.Name = "_1ByteMenuItem"; - this._1ByteMenuItem.Size = new System.Drawing.Size(106, 22); - this._1ByteMenuItem.Text = "&1 Byte"; - this._1ByteMenuItem.Click += new System.EventHandler(this._1ByteMenuItem_Click); - // - // _2ByteMenuItem - // - this._2ByteMenuItem.Name = "_2ByteMenuItem"; - this._2ByteMenuItem.Size = new System.Drawing.Size(106, 22); - this._2ByteMenuItem.Text = "&2 Byte"; - this._2ByteMenuItem.Click += new System.EventHandler(this._2ByteMenuItem_Click); - // - // _4ByteMenuItem - // - this._4ByteMenuItem.Name = "_4ByteMenuItem"; - this._4ByteMenuItem.Size = new System.Drawing.Size(106, 22); - this._4ByteMenuItem.Text = "&4 Byte"; - this._4ByteMenuItem.Click += new System.EventHandler(this._4ByteMenuItem_Click); - // - // CheckMisalignedMenuItem - // - this.CheckMisalignedMenuItem.Name = "CheckMisalignedMenuItem"; - this.CheckMisalignedMenuItem.Size = new System.Drawing.Size(188, 22); - this.CheckMisalignedMenuItem.Text = "Check Mis-aligned"; - this.CheckMisalignedMenuItem.Click += new System.EventHandler(this.CheckMisalignedMenuItem_Click); - // - // toolStripSeparator8 - // - this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(185, 6); - // - // BigEndianMenuItem - // - this.BigEndianMenuItem.Name = "BigEndianMenuItem"; - this.BigEndianMenuItem.Size = new System.Drawing.Size(188, 22); - this.BigEndianMenuItem.Text = "&Big Endian"; - this.BigEndianMenuItem.Click += new System.EventHandler(this.BigEndianMenuItem_Click); - // - // DisplayTypeSubMenu - // - this.DisplayTypeSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.MemoryDomainsSubMenu.Name = "MemoryDomainsSubMenu"; + this.MemoryDomainsSubMenu.Size = new System.Drawing.Size(188, 22); + this.MemoryDomainsSubMenu.Text = "&Memory Domains"; + this.MemoryDomainsSubMenu.DropDownOpened += new System.EventHandler(this.MemoryDomainsSubMenu_DropDownOpened); + // + // toolStripSeparator6 + // + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(57, 6); + // + // sizeToolStripMenuItem + // + this.sizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ByteMenuItem, + this.WordMenuItem, + this.DWordMenuItem}); + this.sizeToolStripMenuItem.Name = "sizeToolStripMenuItem"; + this.sizeToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.sizeToolStripMenuItem.Text = "&Size"; + this.sizeToolStripMenuItem.DropDownOpened += new System.EventHandler(this.SizeSubMenu_DropDownOpened); + // + // ByteMenuItem + // + this.ByteMenuItem.Name = "ByteMenuItem"; + this.ByteMenuItem.Size = new System.Drawing.Size(152, 22); + this.ByteMenuItem.Text = "&1 Byte"; + this.ByteMenuItem.Click += new System.EventHandler(this.ByteMenuItem_Click); + // + // WordMenuItem + // + this.WordMenuItem.Name = "WordMenuItem"; + this.WordMenuItem.Size = new System.Drawing.Size(152, 22); + this.WordMenuItem.Text = "&2 Byte"; + this.WordMenuItem.Click += new System.EventHandler(this.WordMenuItem_Click); + // + // DWordMenuItem + // + this.DWordMenuItem.Name = "DWordMenuItem"; + this.DWordMenuItem.Size = new System.Drawing.Size(152, 22); + this.DWordMenuItem.Text = "&4 Byte"; + this.DWordMenuItem.Click += new System.EventHandler(this.DWordMenuItem_Click_Click); + // + // CheckMisalignedMenuItem + // + this.CheckMisalignedMenuItem.Name = "CheckMisalignedMenuItem"; + this.CheckMisalignedMenuItem.Size = new System.Drawing.Size(188, 22); + this.CheckMisalignedMenuItem.Text = "Check Mis-aligned"; + this.CheckMisalignedMenuItem.Click += new System.EventHandler(this.CheckMisalignedMenuItem_Click); + // + // toolStripSeparator8 + // + this.toolStripSeparator8.Name = "toolStripSeparator8"; + this.toolStripSeparator8.Size = new System.Drawing.Size(185, 6); + // + // BigEndianMenuItem + // + this.BigEndianMenuItem.Name = "BigEndianMenuItem"; + this.BigEndianMenuItem.Size = new System.Drawing.Size(188, 22); + this.BigEndianMenuItem.Text = "&Big Endian"; + this.BigEndianMenuItem.Click += new System.EventHandler(this.BigEndianMenuItem_Click); + // + // DisplayTypeSubMenu + // + this.DisplayTypeSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator1}); - this.DisplayTypeSubMenu.Name = "DisplayTypeSubMenu"; - this.DisplayTypeSubMenu.Size = new System.Drawing.Size(188, 22); - this.DisplayTypeSubMenu.Text = "&Display Type"; - this.DisplayTypeSubMenu.DropDownOpened += new System.EventHandler(this.DisplayTypeSubMenu_DropDownOpened); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(57, 6); - // - // DefinePreviousValueSubMenu - // - this.DefinePreviousValueSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.DisplayTypeSubMenu.Name = "DisplayTypeSubMenu"; + this.DisplayTypeSubMenu.Size = new System.Drawing.Size(188, 22); + this.DisplayTypeSubMenu.Text = "&Display Type"; + this.DisplayTypeSubMenu.DropDownOpened += new System.EventHandler(this.DisplayTypeSubMenu_DropDownOpened); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(57, 6); + // + // DefinePreviousValueSubMenu + // + this.DefinePreviousValueSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Previous_LastSearchMenuItem, this.PreviousFrameMenuItem, this.Previous_OriginalMenuItem}); - this.DefinePreviousValueSubMenu.Name = "DefinePreviousValueSubMenu"; - this.DefinePreviousValueSubMenu.Size = new System.Drawing.Size(188, 22); - this.DefinePreviousValueSubMenu.Text = "Define Previous Value"; - this.DefinePreviousValueSubMenu.DropDownOpened += new System.EventHandler(this.DefinePreviousValueSubMenu_DropDownOpened); - // - // Previous_LastSearchMenuItem - // - this.Previous_LastSearchMenuItem.Name = "Previous_LastSearchMenuItem"; - this.Previous_LastSearchMenuItem.Size = new System.Drawing.Size(155, 22); - this.Previous_LastSearchMenuItem.Text = "Last &Search"; - this.Previous_LastSearchMenuItem.Click += new System.EventHandler(this.Previous_LastSearchMenuItem_Click); - // - // PreviousFrameMenuItem - // - this.PreviousFrameMenuItem.Name = "PreviousFrameMenuItem"; - this.PreviousFrameMenuItem.Size = new System.Drawing.Size(155, 22); - this.PreviousFrameMenuItem.Text = "&Previous Frame"; - this.PreviousFrameMenuItem.Click += new System.EventHandler(this.Previous_LastFrameMenuItem_Click); - // - // Previous_OriginalMenuItem - // - this.Previous_OriginalMenuItem.Name = "Previous_OriginalMenuItem"; - this.Previous_OriginalMenuItem.Size = new System.Drawing.Size(155, 22); - this.Previous_OriginalMenuItem.Text = "&Original"; - this.Previous_OriginalMenuItem.Click += new System.EventHandler(this.Previous_OriginalMenuItem_Click); - // - // searchToolStripMenuItem - // - this.searchToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.DefinePreviousValueSubMenu.Name = "DefinePreviousValueSubMenu"; + this.DefinePreviousValueSubMenu.Size = new System.Drawing.Size(188, 22); + this.DefinePreviousValueSubMenu.Text = "Define Previous Value"; + this.DefinePreviousValueSubMenu.DropDownOpened += new System.EventHandler(this.DefinePreviousValueSubMenu_DropDownOpened); + // + // Previous_LastSearchMenuItem + // + this.Previous_LastSearchMenuItem.Name = "Previous_LastSearchMenuItem"; + this.Previous_LastSearchMenuItem.Size = new System.Drawing.Size(155, 22); + this.Previous_LastSearchMenuItem.Text = "Last &Search"; + this.Previous_LastSearchMenuItem.Click += new System.EventHandler(this.Previous_LastSearchMenuItem_Click); + // + // PreviousFrameMenuItem + // + this.PreviousFrameMenuItem.Name = "PreviousFrameMenuItem"; + this.PreviousFrameMenuItem.Size = new System.Drawing.Size(155, 22); + this.PreviousFrameMenuItem.Text = "&Previous Frame"; + this.PreviousFrameMenuItem.Click += new System.EventHandler(this.Previous_LastFrameMenuItem_Click); + // + // Previous_OriginalMenuItem + // + this.Previous_OriginalMenuItem.Name = "Previous_OriginalMenuItem"; + this.Previous_OriginalMenuItem.Size = new System.Drawing.Size(155, 22); + this.Previous_OriginalMenuItem.Text = "&Original"; + this.Previous_OriginalMenuItem.Click += new System.EventHandler(this.Previous_OriginalMenuItem_Click); + // + // searchToolStripMenuItem + // + this.searchToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newSearchToolStripMenuItem, this.toolStripSeparator7, SearchMenuItem, @@ -619,122 +619,122 @@ this.FreezeAddressMenuItem, this.toolStripSeparator13, this.ClearUndoMenuItem}); - this.searchToolStripMenuItem.Name = "searchToolStripMenuItem"; - this.searchToolStripMenuItem.Size = new System.Drawing.Size(54, 20); - this.searchToolStripMenuItem.Text = "&Search"; - this.searchToolStripMenuItem.DropDownOpened += new System.EventHandler(this.SearchSubMenu_DropDownOpened); - // - // newSearchToolStripMenuItem - // - this.newSearchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; - this.newSearchToolStripMenuItem.Name = "newSearchToolStripMenuItem"; - this.newSearchToolStripMenuItem.Size = new System.Drawing.Size(215, 22); - this.newSearchToolStripMenuItem.Text = "&New Search"; - this.newSearchToolStripMenuItem.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click); - // - // toolStripSeparator7 - // - this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(212, 6); - // - // UndoMenuItem - // - this.UndoMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; - this.UndoMenuItem.Name = "UndoMenuItem"; - this.UndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); - this.UndoMenuItem.Size = new System.Drawing.Size(215, 22); - this.UndoMenuItem.Text = "&Undo"; - this.UndoMenuItem.Click += new System.EventHandler(this.UndoMenuItem_Click); - // - // RedoMenuItem - // - this.RedoMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.redo; - this.RedoMenuItem.Name = "RedoMenuItem"; - this.RedoMenuItem.ShortcutKeyDisplayString = ""; - this.RedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); - this.RedoMenuItem.Size = new System.Drawing.Size(215, 22); - this.RedoMenuItem.Text = "&Redo"; - this.RedoMenuItem.Click += new System.EventHandler(this.RedoMenuItem_Click); - // - // CopyValueToPrevMenuItem - // - this.CopyValueToPrevMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; - this.CopyValueToPrevMenuItem.Name = "CopyValueToPrevMenuItem"; - this.CopyValueToPrevMenuItem.Size = new System.Drawing.Size(215, 22); - this.CopyValueToPrevMenuItem.Text = "Copy Value to Prev"; - this.CopyValueToPrevMenuItem.Click += new System.EventHandler(this.CopyValueToPrevMenuItem_Click); - // - // ClearChangeCountsMenuItem - // - this.ClearChangeCountsMenuItem.Name = "ClearChangeCountsMenuItem"; - this.ClearChangeCountsMenuItem.Size = new System.Drawing.Size(215, 22); - this.ClearChangeCountsMenuItem.Text = "&Clear Change Counts"; - this.ClearChangeCountsMenuItem.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click); - // - // RemoveMenuItem - // - this.RemoveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; - this.RemoveMenuItem.Name = "RemoveMenuItem"; - this.RemoveMenuItem.ShortcutKeyDisplayString = "Delete"; - this.RemoveMenuItem.Size = new System.Drawing.Size(215, 22); - this.RemoveMenuItem.Text = "&Remove selected"; - this.RemoveMenuItem.Click += new System.EventHandler(this.RemoveMenuItem_Click); - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(212, 6); - // - // GoToAddressMenuItem - // - this.GoToAddressMenuItem.Name = "GoToAddressMenuItem"; - this.GoToAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); - this.GoToAddressMenuItem.Size = new System.Drawing.Size(215, 22); - this.GoToAddressMenuItem.Text = "&Go to Address..."; - this.GoToAddressMenuItem.Click += new System.EventHandler(this.GoToAddressMenuItem_Click); - // - // AddToRamWatchMenuItem - // - this.AddToRamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; - this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem"; - this.AddToRamWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(215, 22); - this.AddToRamWatchMenuItem.Text = "&Add to Ram Watch"; - this.AddToRamWatchMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); - // - // PokeAddressMenuItem - // - this.PokeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; - this.PokeAddressMenuItem.Name = "PokeAddressMenuItem"; - this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.PokeAddressMenuItem.Size = new System.Drawing.Size(215, 22); - this.PokeAddressMenuItem.Text = "&Poke Address"; - this.PokeAddressMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); - // - // FreezeAddressMenuItem - // - this.FreezeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; - this.FreezeAddressMenuItem.Name = "FreezeAddressMenuItem"; - this.FreezeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.FreezeAddressMenuItem.Size = new System.Drawing.Size(215, 22); - this.FreezeAddressMenuItem.Text = "Freeze Address"; - this.FreezeAddressMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); - // - // toolStripSeparator13 - // - this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(212, 6); - // - // ClearUndoMenuItem - // - this.ClearUndoMenuItem.Name = "ClearUndoMenuItem"; - this.ClearUndoMenuItem.Size = new System.Drawing.Size(215, 22); - this.ClearUndoMenuItem.Text = "Clear Undo History"; - this.ClearUndoMenuItem.Click += new System.EventHandler(this.ClearUndoMenuItem_Click); - // - // optionsToolStripMenuItem - // - this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.searchToolStripMenuItem.Name = "searchToolStripMenuItem"; + this.searchToolStripMenuItem.Size = new System.Drawing.Size(54, 20); + this.searchToolStripMenuItem.Text = "&Search"; + this.searchToolStripMenuItem.DropDownOpened += new System.EventHandler(this.SearchSubMenu_DropDownOpened); + // + // newSearchToolStripMenuItem + // + this.newSearchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; + this.newSearchToolStripMenuItem.Name = "newSearchToolStripMenuItem"; + this.newSearchToolStripMenuItem.Size = new System.Drawing.Size(215, 22); + this.newSearchToolStripMenuItem.Text = "&New Search"; + this.newSearchToolStripMenuItem.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click); + // + // toolStripSeparator7 + // + this.toolStripSeparator7.Name = "toolStripSeparator7"; + this.toolStripSeparator7.Size = new System.Drawing.Size(212, 6); + // + // UndoMenuItem + // + this.UndoMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; + this.UndoMenuItem.Name = "UndoMenuItem"; + this.UndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); + this.UndoMenuItem.Size = new System.Drawing.Size(215, 22); + this.UndoMenuItem.Text = "&Undo"; + this.UndoMenuItem.Click += new System.EventHandler(this.UndoMenuItem_Click); + // + // RedoMenuItem + // + this.RedoMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.redo; + this.RedoMenuItem.Name = "RedoMenuItem"; + this.RedoMenuItem.ShortcutKeyDisplayString = ""; + this.RedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); + this.RedoMenuItem.Size = new System.Drawing.Size(215, 22); + this.RedoMenuItem.Text = "&Redo"; + this.RedoMenuItem.Click += new System.EventHandler(this.RedoMenuItem_Click); + // + // CopyValueToPrevMenuItem + // + this.CopyValueToPrevMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; + this.CopyValueToPrevMenuItem.Name = "CopyValueToPrevMenuItem"; + this.CopyValueToPrevMenuItem.Size = new System.Drawing.Size(215, 22); + this.CopyValueToPrevMenuItem.Text = "Copy Value to Prev"; + this.CopyValueToPrevMenuItem.Click += new System.EventHandler(this.CopyValueToPrevMenuItem_Click); + // + // ClearChangeCountsMenuItem + // + this.ClearChangeCountsMenuItem.Name = "ClearChangeCountsMenuItem"; + this.ClearChangeCountsMenuItem.Size = new System.Drawing.Size(215, 22); + this.ClearChangeCountsMenuItem.Text = "&Clear Change Counts"; + this.ClearChangeCountsMenuItem.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click); + // + // RemoveMenuItem + // + this.RemoveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; + this.RemoveMenuItem.Name = "RemoveMenuItem"; + this.RemoveMenuItem.ShortcutKeyDisplayString = "Delete"; + this.RemoveMenuItem.Size = new System.Drawing.Size(215, 22); + this.RemoveMenuItem.Text = "&Remove selected"; + this.RemoveMenuItem.Click += new System.EventHandler(this.RemoveMenuItem_Click); + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(212, 6); + // + // GoToAddressMenuItem + // + this.GoToAddressMenuItem.Name = "GoToAddressMenuItem"; + this.GoToAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); + this.GoToAddressMenuItem.Size = new System.Drawing.Size(215, 22); + this.GoToAddressMenuItem.Text = "&Go to Address..."; + this.GoToAddressMenuItem.Click += new System.EventHandler(this.GoToAddressMenuItem_Click); + // + // AddToRamWatchMenuItem + // + this.AddToRamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; + this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem"; + this.AddToRamWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); + this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(215, 22); + this.AddToRamWatchMenuItem.Text = "&Add to Ram Watch"; + this.AddToRamWatchMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); + // + // PokeAddressMenuItem + // + this.PokeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; + this.PokeAddressMenuItem.Name = "PokeAddressMenuItem"; + this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); + this.PokeAddressMenuItem.Size = new System.Drawing.Size(215, 22); + this.PokeAddressMenuItem.Text = "&Poke Address"; + this.PokeAddressMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); + // + // FreezeAddressMenuItem + // + this.FreezeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; + this.FreezeAddressMenuItem.Name = "FreezeAddressMenuItem"; + this.FreezeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); + this.FreezeAddressMenuItem.Size = new System.Drawing.Size(215, 22); + this.FreezeAddressMenuItem.Text = "Freeze Address"; + this.FreezeAddressMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); + // + // toolStripSeparator13 + // + this.toolStripSeparator13.Name = "toolStripSeparator13"; + this.toolStripSeparator13.Size = new System.Drawing.Size(212, 6); + // + // ClearUndoMenuItem + // + this.ClearUndoMenuItem.Name = "ClearUndoMenuItem"; + this.ClearUndoMenuItem.Size = new System.Drawing.Size(215, 22); + this.ClearUndoMenuItem.Text = "Clear Undo History"; + this.ClearUndoMenuItem.Click += new System.EventHandler(this.ClearUndoMenuItem_Click); + // + // optionsToolStripMenuItem + // + this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.PreviewModeMenuItem, this.AutoSearchMenuItem, this.toolStripSeparator9, @@ -746,287 +746,287 @@ this.AlwaysOnTopMenuItem, this.toolStripSeparator3, this.RestoreDefaultsMenuItem}); - this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); - this.optionsToolStripMenuItem.Text = "&Options"; - this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); - // - // PreviewModeMenuItem - // - this.PreviewModeMenuItem.Name = "PreviewModeMenuItem"; - this.PreviewModeMenuItem.Size = new System.Drawing.Size(240, 22); - this.PreviewModeMenuItem.Text = "Preview Mode"; - this.PreviewModeMenuItem.Click += new System.EventHandler(this.PreviewModeMenuItem_Click); - // - // AutoSearchMenuItem - // - this.AutoSearchMenuItem.Name = "AutoSearchMenuItem"; - this.AutoSearchMenuItem.Size = new System.Drawing.Size(240, 22); - this.AutoSearchMenuItem.Text = "Auto-Search"; - this.AutoSearchMenuItem.Click += new System.EventHandler(this.AutoSearchMenuItem_Click); - // - // toolStripSeparator9 - // - this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(237, 6); - // - // ExcludeRamWatchMenuItem - // - this.ExcludeRamWatchMenuItem.Name = "ExcludeRamWatchMenuItem"; - this.ExcludeRamWatchMenuItem.Size = new System.Drawing.Size(240, 22); - this.ExcludeRamWatchMenuItem.Text = "Always Exclude Ram Search List"; - this.ExcludeRamWatchMenuItem.Click += new System.EventHandler(this.ExcludeRamWatchMenuItem_Click); - // - // UseUndoHistoryMenuItem - // - this.UseUndoHistoryMenuItem.Name = "UseUndoHistoryMenuItem"; - this.UseUndoHistoryMenuItem.Size = new System.Drawing.Size(240, 22); - this.UseUndoHistoryMenuItem.Text = "&Use Undo History"; - this.UseUndoHistoryMenuItem.Click += new System.EventHandler(this.UseUndoHistoryMenuItem_Click); - // - // toolStripSeparator11 - // - this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(237, 6); - // - // AutoloadDialogMenuItem - // - this.AutoloadDialogMenuItem.Name = "AutoloadDialogMenuItem"; - this.AutoloadDialogMenuItem.Size = new System.Drawing.Size(240, 22); - this.AutoloadDialogMenuItem.Text = "Autoload"; - this.AutoloadDialogMenuItem.Click += new System.EventHandler(this.AutoloadDialogMenuItem_Click); - // - // SaveWinPositionMenuItem - // - this.SaveWinPositionMenuItem.Name = "SaveWinPositionMenuItem"; - this.SaveWinPositionMenuItem.Size = new System.Drawing.Size(240, 22); - this.SaveWinPositionMenuItem.Text = "Save Window Position"; - this.SaveWinPositionMenuItem.Click += new System.EventHandler(this.SaveWinPositionMenuItem_Click); - // - // AlwaysOnTopMenuItem - // - this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; - this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(240, 22); - this.AlwaysOnTopMenuItem.Text = "Always On Top"; - this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(237, 6); - // - // RestoreDefaultsMenuItem - // - this.RestoreDefaultsMenuItem.Name = "RestoreDefaultsMenuItem"; - this.RestoreDefaultsMenuItem.Size = new System.Drawing.Size(240, 22); - this.RestoreDefaultsMenuItem.Text = "Restore Default Settings"; - this.RestoreDefaultsMenuItem.Click += new System.EventHandler(this.RestoreDefaultsMenuItem_Click); - // - // ColumnsMenuItem - // - this.ColumnsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); + this.optionsToolStripMenuItem.Text = "&Options"; + this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); + // + // PreviewModeMenuItem + // + this.PreviewModeMenuItem.Name = "PreviewModeMenuItem"; + this.PreviewModeMenuItem.Size = new System.Drawing.Size(240, 22); + this.PreviewModeMenuItem.Text = "Preview Mode"; + this.PreviewModeMenuItem.Click += new System.EventHandler(this.PreviewModeMenuItem_Click); + // + // AutoSearchMenuItem + // + this.AutoSearchMenuItem.Name = "AutoSearchMenuItem"; + this.AutoSearchMenuItem.Size = new System.Drawing.Size(240, 22); + this.AutoSearchMenuItem.Text = "Auto-Search"; + this.AutoSearchMenuItem.Click += new System.EventHandler(this.AutoSearchMenuItem_Click); + // + // toolStripSeparator9 + // + this.toolStripSeparator9.Name = "toolStripSeparator9"; + this.toolStripSeparator9.Size = new System.Drawing.Size(237, 6); + // + // ExcludeRamWatchMenuItem + // + this.ExcludeRamWatchMenuItem.Name = "ExcludeRamWatchMenuItem"; + this.ExcludeRamWatchMenuItem.Size = new System.Drawing.Size(240, 22); + this.ExcludeRamWatchMenuItem.Text = "Always Exclude Ram Search List"; + this.ExcludeRamWatchMenuItem.Click += new System.EventHandler(this.ExcludeRamWatchMenuItem_Click); + // + // UseUndoHistoryMenuItem + // + this.UseUndoHistoryMenuItem.Name = "UseUndoHistoryMenuItem"; + this.UseUndoHistoryMenuItem.Size = new System.Drawing.Size(240, 22); + this.UseUndoHistoryMenuItem.Text = "&Use Undo History"; + this.UseUndoHistoryMenuItem.Click += new System.EventHandler(this.UseUndoHistoryMenuItem_Click); + // + // toolStripSeparator11 + // + this.toolStripSeparator11.Name = "toolStripSeparator11"; + this.toolStripSeparator11.Size = new System.Drawing.Size(237, 6); + // + // AutoloadDialogMenuItem + // + this.AutoloadDialogMenuItem.Name = "AutoloadDialogMenuItem"; + this.AutoloadDialogMenuItem.Size = new System.Drawing.Size(240, 22); + this.AutoloadDialogMenuItem.Text = "Autoload"; + this.AutoloadDialogMenuItem.Click += new System.EventHandler(this.AutoloadDialogMenuItem_Click); + // + // SaveWinPositionMenuItem + // + this.SaveWinPositionMenuItem.Name = "SaveWinPositionMenuItem"; + this.SaveWinPositionMenuItem.Size = new System.Drawing.Size(240, 22); + this.SaveWinPositionMenuItem.Text = "Save Window Position"; + this.SaveWinPositionMenuItem.Click += new System.EventHandler(this.SaveWinPositionMenuItem_Click); + // + // AlwaysOnTopMenuItem + // + this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; + this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(240, 22); + this.AlwaysOnTopMenuItem.Text = "Always On Top"; + this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(237, 6); + // + // RestoreDefaultsMenuItem + // + this.RestoreDefaultsMenuItem.Name = "RestoreDefaultsMenuItem"; + this.RestoreDefaultsMenuItem.Size = new System.Drawing.Size(240, 22); + this.RestoreDefaultsMenuItem.Text = "Restore Default Settings"; + this.RestoreDefaultsMenuItem.Click += new System.EventHandler(this.RestoreDefaultsMenuItem_Click); + // + // ColumnsMenuItem + // + this.ColumnsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ShowPreviousMenuItem, this.ShowChangesMenuItem, this.ShowDiffMenuItem}); - this.ColumnsMenuItem.Name = "ColumnsMenuItem"; - this.ColumnsMenuItem.Size = new System.Drawing.Size(67, 20); - this.ColumnsMenuItem.Text = "&Columns"; - this.ColumnsMenuItem.DropDownOpened += new System.EventHandler(this.ColumnsMenuItem_DropDownOpened); - // - // ShowPreviousMenuItem - // - this.ShowPreviousMenuItem.Name = "ShowPreviousMenuItem"; - this.ShowPreviousMenuItem.Size = new System.Drawing.Size(156, 22); - this.ShowPreviousMenuItem.Text = "&Previous Value"; - this.ShowPreviousMenuItem.Click += new System.EventHandler(this.ShowPreviousMenuItem_Click); - // - // ShowChangesMenuItem - // - this.ShowChangesMenuItem.Name = "ShowChangesMenuItem"; - this.ShowChangesMenuItem.Size = new System.Drawing.Size(156, 22); - this.ShowChangesMenuItem.Text = "&Change Counts"; - this.ShowChangesMenuItem.Click += new System.EventHandler(this.ShowChangesMenuItem_Click); - // - // ShowDiffMenuItem - // - this.ShowDiffMenuItem.Name = "ShowDiffMenuItem"; - this.ShowDiffMenuItem.Size = new System.Drawing.Size(156, 22); - this.ShowDiffMenuItem.Text = "&Difference"; - this.ShowDiffMenuItem.Click += new System.EventHandler(this.ShowDiffMenuItem_Click); - // - // MemDomainLabel - // - this.MemDomainLabel.AutoSize = true; - this.MemDomainLabel.Location = new System.Drawing.Point(135, 49); - this.MemDomainLabel.Name = "MemDomainLabel"; - this.MemDomainLabel.Size = new System.Drawing.Size(70, 13); - this.MemDomainLabel.TabIndex = 8; - this.MemDomainLabel.Text = "Main Memory"; - // - // MessageLabel - // - this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.MessageLabel.AutoSize = true; - this.MessageLabel.Location = new System.Drawing.Point(9, 434); - this.MessageLabel.Name = "MessageLabel"; - this.MessageLabel.Size = new System.Drawing.Size(106, 13); - this.MessageLabel.TabIndex = 9; - this.MessageLabel.Text = " todo "; - // - // AutoSearchCheckBox - // - this.AutoSearchCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.AutoSearchCheckBox.Appearance = System.Windows.Forms.Appearance.Button; - this.AutoSearchCheckBox.AutoSize = true; - this.AutoSearchCheckBox.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AutoSearch; - this.AutoSearchCheckBox.Location = new System.Drawing.Point(316, 410); - this.AutoSearchCheckBox.Name = "AutoSearchCheckBox"; - this.AutoSearchCheckBox.Size = new System.Drawing.Size(38, 22); - this.AutoSearchCheckBox.TabIndex = 105; - this.AutoSearchCheckBox.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.toolTip1.SetToolTip(this.AutoSearchCheckBox, "Automatically search each frame"); - this.AutoSearchCheckBox.UseVisualStyleBackColor = true; - this.AutoSearchCheckBox.Click += new System.EventHandler(this.AutoSearchMenuItem_Click); - // - // CompareToBox - // - this.CompareToBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.CompareToBox.Controls.Add(this.DifferenceBox); - this.CompareToBox.Controls.Add(this.DifferenceRadio); - this.CompareToBox.Controls.Add(this.NumberOfChangesBox); - this.CompareToBox.Controls.Add(this.SpecificAddressBox); - this.CompareToBox.Controls.Add(this.SpecificValueBox); - this.CompareToBox.Controls.Add(this.NumberOfChangesRadio); - this.CompareToBox.Controls.Add(this.SpecificAddressRadio); - this.CompareToBox.Controls.Add(this.SpecificValueRadio); - this.CompareToBox.Controls.Add(this.PreviousValueRadio); - this.CompareToBox.Location = new System.Drawing.Point(244, 65); - this.CompareToBox.Name = "CompareToBox"; - this.CompareToBox.Size = new System.Drawing.Size(190, 125); - this.CompareToBox.TabIndex = 10; - this.CompareToBox.TabStop = false; - this.CompareToBox.Text = "Compare To / By"; - // - // DifferenceBox - // - this.DifferenceBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.ColumnsMenuItem.Name = "ColumnsMenuItem"; + this.ColumnsMenuItem.Size = new System.Drawing.Size(67, 20); + this.ColumnsMenuItem.Text = "&Columns"; + this.ColumnsMenuItem.DropDownOpened += new System.EventHandler(this.ColumnsMenuItem_DropDownOpened); + // + // ShowPreviousMenuItem + // + this.ShowPreviousMenuItem.Name = "ShowPreviousMenuItem"; + this.ShowPreviousMenuItem.Size = new System.Drawing.Size(156, 22); + this.ShowPreviousMenuItem.Text = "&Previous Value"; + this.ShowPreviousMenuItem.Click += new System.EventHandler(this.ShowPreviousMenuItem_Click); + // + // ShowChangesMenuItem + // + this.ShowChangesMenuItem.Name = "ShowChangesMenuItem"; + this.ShowChangesMenuItem.Size = new System.Drawing.Size(156, 22); + this.ShowChangesMenuItem.Text = "&Change Counts"; + this.ShowChangesMenuItem.Click += new System.EventHandler(this.ShowChangesMenuItem_Click); + // + // ShowDiffMenuItem + // + this.ShowDiffMenuItem.Name = "ShowDiffMenuItem"; + this.ShowDiffMenuItem.Size = new System.Drawing.Size(156, 22); + this.ShowDiffMenuItem.Text = "&Difference"; + this.ShowDiffMenuItem.Click += new System.EventHandler(this.ShowDiffMenuItem_Click); + // + // MemDomainLabel + // + this.MemDomainLabel.AutoSize = true; + this.MemDomainLabel.Location = new System.Drawing.Point(135, 49); + this.MemDomainLabel.Name = "MemDomainLabel"; + this.MemDomainLabel.Size = new System.Drawing.Size(70, 13); + this.MemDomainLabel.TabIndex = 8; + this.MemDomainLabel.Text = "Main Memory"; + // + // MessageLabel + // + this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.MessageLabel.AutoSize = true; + this.MessageLabel.Location = new System.Drawing.Point(9, 434); + this.MessageLabel.Name = "MessageLabel"; + this.MessageLabel.Size = new System.Drawing.Size(106, 13); + this.MessageLabel.TabIndex = 9; + this.MessageLabel.Text = " todo "; + // + // AutoSearchCheckBox + // + this.AutoSearchCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.AutoSearchCheckBox.Appearance = System.Windows.Forms.Appearance.Button; + this.AutoSearchCheckBox.AutoSize = true; + this.AutoSearchCheckBox.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AutoSearch; + this.AutoSearchCheckBox.Location = new System.Drawing.Point(316, 410); + this.AutoSearchCheckBox.Name = "AutoSearchCheckBox"; + this.AutoSearchCheckBox.Size = new System.Drawing.Size(38, 22); + this.AutoSearchCheckBox.TabIndex = 105; + this.AutoSearchCheckBox.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.toolTip1.SetToolTip(this.AutoSearchCheckBox, "Automatically search each frame"); + this.AutoSearchCheckBox.UseVisualStyleBackColor = true; + this.AutoSearchCheckBox.Click += new System.EventHandler(this.AutoSearchMenuItem_Click); + // + // CompareToBox + // + this.CompareToBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CompareToBox.Controls.Add(this.DifferenceBox); + this.CompareToBox.Controls.Add(this.DifferenceRadio); + this.CompareToBox.Controls.Add(this.NumberOfChangesBox); + this.CompareToBox.Controls.Add(this.SpecificAddressBox); + this.CompareToBox.Controls.Add(this.SpecificValueBox); + this.CompareToBox.Controls.Add(this.NumberOfChangesRadio); + this.CompareToBox.Controls.Add(this.SpecificAddressRadio); + this.CompareToBox.Controls.Add(this.SpecificValueRadio); + this.CompareToBox.Controls.Add(this.PreviousValueRadio); + this.CompareToBox.Location = new System.Drawing.Point(244, 65); + this.CompareToBox.Name = "CompareToBox"; + this.CompareToBox.Size = new System.Drawing.Size(190, 125); + this.CompareToBox.TabIndex = 10; + this.CompareToBox.TabStop = false; + this.CompareToBox.Text = "Compare To / By"; + // + // DifferenceBox + // + this.DifferenceBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.DifferenceBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.DifferenceBox.Enabled = false; - this.DifferenceBox.Location = new System.Drawing.Point(114, 98); - this.DifferenceBox.MaxLength = 8; - this.DifferenceBox.Name = "DifferenceBox"; - this.DifferenceBox.Nullable = false; - this.DifferenceBox.Size = new System.Drawing.Size(72, 20); - this.DifferenceBox.TabIndex = 45; - this.DifferenceBox.TextChanged += new System.EventHandler(this.CompareToValue_TextChanged); - // - // DifferenceRadio - // - this.DifferenceRadio.AutoSize = true; - this.DifferenceRadio.Location = new System.Drawing.Point(6, 100); - this.DifferenceRadio.Name = "DifferenceRadio"; - this.DifferenceRadio.Size = new System.Drawing.Size(89, 17); - this.DifferenceRadio.TabIndex = 40; - this.DifferenceRadio.Text = "Difference of:"; - this.DifferenceRadio.UseVisualStyleBackColor = true; - this.DifferenceRadio.Click += new System.EventHandler(this.DifferenceRadio_Click); - // - // NumberOfChangesBox - // - this.NumberOfChangesBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.DifferenceBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.DifferenceBox.Enabled = false; + this.DifferenceBox.Location = new System.Drawing.Point(114, 98); + this.DifferenceBox.MaxLength = 8; + this.DifferenceBox.Name = "DifferenceBox"; + this.DifferenceBox.Nullable = false; + this.DifferenceBox.Size = new System.Drawing.Size(72, 20); + this.DifferenceBox.TabIndex = 45; + this.DifferenceBox.TextChanged += new System.EventHandler(this.CompareToValue_TextChanged); + // + // DifferenceRadio + // + this.DifferenceRadio.AutoSize = true; + this.DifferenceRadio.Location = new System.Drawing.Point(6, 100); + this.DifferenceRadio.Name = "DifferenceRadio"; + this.DifferenceRadio.Size = new System.Drawing.Size(89, 17); + this.DifferenceRadio.TabIndex = 40; + this.DifferenceRadio.Text = "Difference of:"; + this.DifferenceRadio.UseVisualStyleBackColor = true; + this.DifferenceRadio.Click += new System.EventHandler(this.DifferenceRadio_Click); + // + // NumberOfChangesBox + // + this.NumberOfChangesBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.NumberOfChangesBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.NumberOfChangesBox.Enabled = false; - this.NumberOfChangesBox.Location = new System.Drawing.Point(114, 78); - this.NumberOfChangesBox.MaxLength = 8; - this.NumberOfChangesBox.Name = "NumberOfChangesBox"; - this.NumberOfChangesBox.Nullable = false; - this.NumberOfChangesBox.Size = new System.Drawing.Size(72, 20); - this.NumberOfChangesBox.TabIndex = 35; - this.NumberOfChangesBox.TextChanged += new System.EventHandler(this.CompareToValue_TextChanged); - // - // SpecificAddressBox - // - this.SpecificAddressBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.NumberOfChangesBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.NumberOfChangesBox.Enabled = false; + this.NumberOfChangesBox.Location = new System.Drawing.Point(114, 78); + this.NumberOfChangesBox.MaxLength = 8; + this.NumberOfChangesBox.Name = "NumberOfChangesBox"; + this.NumberOfChangesBox.Nullable = false; + this.NumberOfChangesBox.Size = new System.Drawing.Size(72, 20); + this.NumberOfChangesBox.TabIndex = 35; + this.NumberOfChangesBox.TextChanged += new System.EventHandler(this.CompareToValue_TextChanged); + // + // SpecificAddressBox + // + this.SpecificAddressBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.SpecificAddressBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.SpecificAddressBox.Enabled = false; - this.SpecificAddressBox.Location = new System.Drawing.Point(114, 58); - this.SpecificAddressBox.MaxLength = 8; - this.SpecificAddressBox.Name = "SpecificAddressBox"; - this.SpecificAddressBox.Nullable = false; - this.SpecificAddressBox.Size = new System.Drawing.Size(72, 20); - this.SpecificAddressBox.TabIndex = 25; - this.SpecificAddressBox.TextChanged += new System.EventHandler(this.CompareToValue_TextChanged); - // - // SpecificValueBox - // - this.SpecificValueBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.SpecificAddressBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.SpecificAddressBox.Enabled = false; + this.SpecificAddressBox.Location = new System.Drawing.Point(114, 58); + this.SpecificAddressBox.MaxLength = 8; + this.SpecificAddressBox.Name = "SpecificAddressBox"; + this.SpecificAddressBox.Nullable = false; + this.SpecificAddressBox.Size = new System.Drawing.Size(72, 20); + this.SpecificAddressBox.TabIndex = 25; + this.SpecificAddressBox.TextChanged += new System.EventHandler(this.CompareToValue_TextChanged); + // + // SpecificValueBox + // + this.SpecificValueBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.SpecificValueBox.ByteSize = BizHawk.Client.Common.Watch.WatchSize.Byte; - this.SpecificValueBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.SpecificValueBox.Enabled = false; - this.SpecificValueBox.Location = new System.Drawing.Point(114, 38); - this.SpecificValueBox.MaxLength = 2; - this.SpecificValueBox.Name = "SpecificValueBox"; - this.SpecificValueBox.Nullable = false; - this.SpecificValueBox.Size = new System.Drawing.Size(72, 20); - this.SpecificValueBox.TabIndex = 15; - this.SpecificValueBox.Text = "00"; - this.SpecificValueBox.Type = BizHawk.Client.Common.Watch.DisplayType.Hex; - this.SpecificValueBox.TextChanged += new System.EventHandler(this.CompareToValue_TextChanged); - // - // NumberOfChangesRadio - // - this.NumberOfChangesRadio.AutoSize = true; - this.NumberOfChangesRadio.Location = new System.Drawing.Point(7, 80); - this.NumberOfChangesRadio.Name = "NumberOfChangesRadio"; - this.NumberOfChangesRadio.Size = new System.Drawing.Size(111, 17); - this.NumberOfChangesRadio.TabIndex = 30; - this.NumberOfChangesRadio.Text = "Specific Changes:"; - this.NumberOfChangesRadio.UseVisualStyleBackColor = true; - this.NumberOfChangesRadio.Click += new System.EventHandler(this.NumberOfChangesRadio_Click); - // - // SpecificAddressRadio - // - this.SpecificAddressRadio.AutoSize = true; - this.SpecificAddressRadio.Location = new System.Drawing.Point(7, 60); - this.SpecificAddressRadio.Name = "SpecificAddressRadio"; - this.SpecificAddressRadio.Size = new System.Drawing.Size(107, 17); - this.SpecificAddressRadio.TabIndex = 20; - this.SpecificAddressRadio.Text = "Specific Address:"; - this.SpecificAddressRadio.UseVisualStyleBackColor = true; - this.SpecificAddressRadio.Click += new System.EventHandler(this.SpecificAddressRadio_Click); - // - // SpecificValueRadio - // - this.SpecificValueRadio.AutoSize = true; - this.SpecificValueRadio.Location = new System.Drawing.Point(7, 40); - this.SpecificValueRadio.Name = "SpecificValueRadio"; - this.SpecificValueRadio.Size = new System.Drawing.Size(96, 17); - this.SpecificValueRadio.TabIndex = 10; - this.SpecificValueRadio.Text = "Specific Value:"; - this.SpecificValueRadio.UseVisualStyleBackColor = true; - this.SpecificValueRadio.Click += new System.EventHandler(this.SpecificValueRadio_Click); - // - // PreviousValueRadio - // - this.PreviousValueRadio.AutoSize = true; - this.PreviousValueRadio.Checked = true; - this.PreviousValueRadio.Location = new System.Drawing.Point(7, 20); - this.PreviousValueRadio.Name = "PreviousValueRadio"; - this.PreviousValueRadio.Size = new System.Drawing.Size(96, 17); - this.PreviousValueRadio.TabIndex = 5; - this.PreviousValueRadio.TabStop = true; - this.PreviousValueRadio.Text = "Previous Value"; - this.PreviousValueRadio.UseVisualStyleBackColor = true; - this.PreviousValueRadio.Click += new System.EventHandler(this.PreviousValueRadio_Click); - // - // toolStrip1 - // - this.toolStrip1.ClickThrough = true; - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SpecificValueBox.ByteSize = BizHawk.Client.Common.Watch.WatchSize.Byte; + this.SpecificValueBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.SpecificValueBox.Enabled = false; + this.SpecificValueBox.Location = new System.Drawing.Point(114, 38); + this.SpecificValueBox.MaxLength = 2; + this.SpecificValueBox.Name = "SpecificValueBox"; + this.SpecificValueBox.Nullable = false; + this.SpecificValueBox.Size = new System.Drawing.Size(72, 20); + this.SpecificValueBox.TabIndex = 15; + this.SpecificValueBox.Text = "00"; + this.SpecificValueBox.Type = BizHawk.Client.Common.Watch.DisplayType.Hex; + this.SpecificValueBox.TextChanged += new System.EventHandler(this.CompareToValue_TextChanged); + // + // NumberOfChangesRadio + // + this.NumberOfChangesRadio.AutoSize = true; + this.NumberOfChangesRadio.Location = new System.Drawing.Point(7, 80); + this.NumberOfChangesRadio.Name = "NumberOfChangesRadio"; + this.NumberOfChangesRadio.Size = new System.Drawing.Size(111, 17); + this.NumberOfChangesRadio.TabIndex = 30; + this.NumberOfChangesRadio.Text = "Specific Changes:"; + this.NumberOfChangesRadio.UseVisualStyleBackColor = true; + this.NumberOfChangesRadio.Click += new System.EventHandler(this.NumberOfChangesRadio_Click); + // + // SpecificAddressRadio + // + this.SpecificAddressRadio.AutoSize = true; + this.SpecificAddressRadio.Location = new System.Drawing.Point(7, 60); + this.SpecificAddressRadio.Name = "SpecificAddressRadio"; + this.SpecificAddressRadio.Size = new System.Drawing.Size(107, 17); + this.SpecificAddressRadio.TabIndex = 20; + this.SpecificAddressRadio.Text = "Specific Address:"; + this.SpecificAddressRadio.UseVisualStyleBackColor = true; + this.SpecificAddressRadio.Click += new System.EventHandler(this.SpecificAddressRadio_Click); + // + // SpecificValueRadio + // + this.SpecificValueRadio.AutoSize = true; + this.SpecificValueRadio.Location = new System.Drawing.Point(7, 40); + this.SpecificValueRadio.Name = "SpecificValueRadio"; + this.SpecificValueRadio.Size = new System.Drawing.Size(96, 17); + this.SpecificValueRadio.TabIndex = 10; + this.SpecificValueRadio.Text = "Specific Value:"; + this.SpecificValueRadio.UseVisualStyleBackColor = true; + this.SpecificValueRadio.Click += new System.EventHandler(this.SpecificValueRadio_Click); + // + // PreviousValueRadio + // + this.PreviousValueRadio.AutoSize = true; + this.PreviousValueRadio.Checked = true; + this.PreviousValueRadio.Location = new System.Drawing.Point(7, 20); + this.PreviousValueRadio.Name = "PreviousValueRadio"; + this.PreviousValueRadio.Size = new System.Drawing.Size(96, 17); + this.PreviousValueRadio.TabIndex = 5; + this.PreviousValueRadio.TabStop = true; + this.PreviousValueRadio.Text = "Previous Value"; + this.PreviousValueRadio.UseVisualStyleBackColor = true; + this.PreviousValueRadio.Click += new System.EventHandler(this.PreviousValueRadio_Click); + // + // toolStrip1 + // + this.toolStrip1.ClickThrough = true; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DoSearchToolButton, this.toolStripSeparator10, this.NewSearchToolButton, @@ -1043,369 +1043,369 @@ this.RedoToolBarItem, this.RebootToolBarSeparator, this.RebootToolbarButton}); - this.toolStrip1.Location = new System.Drawing.Point(0, 24); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(445, 25); - this.toolStrip1.TabIndex = 11; - this.toolStrip1.Text = "toolStrip1"; - // - // DoSearchToolButton - // - this.DoSearchToolButton.Enabled = false; - this.DoSearchToolButton.Image = ((System.Drawing.Image)(resources.GetObject("DoSearchToolButton.Image"))); - this.DoSearchToolButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.DoSearchToolButton.Name = "DoSearchToolButton"; - this.DoSearchToolButton.Size = new System.Drawing.Size(65, 22); - this.DoSearchToolButton.Text = "Search "; - this.DoSearchToolButton.Click += new System.EventHandler(this.SearchMenuItem_Click); - // - // toolStripSeparator10 - // - this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(6, 25); - // - // NewSearchToolButton - // - this.NewSearchToolButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; - this.NewSearchToolButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.NewSearchToolButton.Name = "NewSearchToolButton"; - this.NewSearchToolButton.Size = new System.Drawing.Size(51, 22); - this.NewSearchToolButton.Text = "New"; - this.NewSearchToolButton.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click); - // - // toolStripSeparator15 - // - this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(6, 25); - // - // CopyValueToPrevToolBarItem - // - this.CopyValueToPrevToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.CopyValueToPrevToolBarItem.Enabled = false; - this.CopyValueToPrevToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; - this.CopyValueToPrevToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.CopyValueToPrevToolBarItem.Name = "CopyValueToPrevToolBarItem"; - this.CopyValueToPrevToolBarItem.Size = new System.Drawing.Size(23, 22); - this.CopyValueToPrevToolBarItem.Text = "Copy Value to Previous"; - this.CopyValueToPrevToolBarItem.Click += new System.EventHandler(this.CopyValueToPrevMenuItem_Click); - // - // ClearChangeCountsToolBarItem - // - this.ClearChangeCountsToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.ClearChangeCountsToolBarItem.Image = ((System.Drawing.Image)(resources.GetObject("ClearChangeCountsToolBarItem.Image"))); - this.ClearChangeCountsToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.ClearChangeCountsToolBarItem.Name = "ClearChangeCountsToolBarItem"; - this.ClearChangeCountsToolBarItem.Size = new System.Drawing.Size(23, 22); - this.ClearChangeCountsToolBarItem.Text = "C"; - this.ClearChangeCountsToolBarItem.ToolTipText = "Clear Change Counts"; - this.ClearChangeCountsToolBarItem.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click); - // - // toolStripSeparator16 - // - this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(6, 25); - // - // RemoveToolBarItem - // - this.RemoveToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RemoveToolBarItem.Enabled = false; - this.RemoveToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; - this.RemoveToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.RemoveToolBarItem.Name = "RemoveToolBarItem"; - this.RemoveToolBarItem.Size = new System.Drawing.Size(23, 22); - this.RemoveToolBarItem.Text = "C&ut"; - this.RemoveToolBarItem.ToolTipText = "Eliminate Selected Items"; - this.RemoveToolBarItem.Click += new System.EventHandler(this.RemoveMenuItem_Click); - // - // AddToRamWatchToolBarItem - // - this.AddToRamWatchToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.AddToRamWatchToolBarItem.Enabled = false; - this.AddToRamWatchToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; - this.AddToRamWatchToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.AddToRamWatchToolBarItem.Name = "AddToRamWatchToolBarItem"; - this.AddToRamWatchToolBarItem.Size = new System.Drawing.Size(23, 22); - this.AddToRamWatchToolBarItem.Text = "Watch"; - this.AddToRamWatchToolBarItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); - // - // PokeAddressToolBarItem - // - this.PokeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PokeAddressToolBarItem.Enabled = false; - this.PokeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; - this.PokeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.PokeAddressToolBarItem.Name = "PokeAddressToolBarItem"; - this.PokeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); - this.PokeAddressToolBarItem.Text = "Poke"; - this.PokeAddressToolBarItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); - // - // FreezeAddressToolBarItem - // - this.FreezeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.FreezeAddressToolBarItem.Enabled = false; - this.FreezeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; - this.FreezeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.FreezeAddressToolBarItem.Name = "FreezeAddressToolBarItem"; - this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); - this.FreezeAddressToolBarItem.Text = "Freeze"; - this.FreezeAddressToolBarItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); - // - // toolStripSeparator12 - // - this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(6, 25); - // - // UndoToolBarButton - // - this.UndoToolBarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.UndoToolBarButton.Enabled = false; - this.UndoToolBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; - this.UndoToolBarButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.UndoToolBarButton.Name = "UndoToolBarButton"; - this.UndoToolBarButton.Size = new System.Drawing.Size(23, 22); - this.UndoToolBarButton.Text = "Undo Search"; - this.UndoToolBarButton.Click += new System.EventHandler(this.UndoMenuItem_Click); - // - // RedoToolBarItem - // - this.RedoToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RedoToolBarItem.Enabled = false; - this.RedoToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.redo; - this.RedoToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; - this.RedoToolBarItem.Name = "RedoToolBarItem"; - this.RedoToolBarItem.Size = new System.Drawing.Size(23, 22); - this.RedoToolBarItem.Text = "Redo"; - this.RedoToolBarItem.Click += new System.EventHandler(this.RedoMenuItem_Click); - // - // RebootToolBarSeparator - // - this.RebootToolBarSeparator.Name = "RebootToolBarSeparator"; - this.RebootToolBarSeparator.Size = new System.Drawing.Size(6, 25); - // - // RebootToolbarButton - // - this.RebootToolbarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RebootToolbarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot; - this.RebootToolbarButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.RebootToolbarButton.Name = "RebootToolbarButton"; - this.RebootToolbarButton.Size = new System.Drawing.Size(23, 22); - this.RebootToolbarButton.Text = "A new search needs to be started in order for these changes to take effect"; - this.RebootToolbarButton.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click); - // - // ComparisonBox - // - this.ComparisonBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.ComparisonBox.Controls.Add(this.DifferentByBox); - this.ComparisonBox.Controls.Add(this.DifferentByRadio); - this.ComparisonBox.Controls.Add(this.NotEqualToRadio); - this.ComparisonBox.Controls.Add(this.EqualToRadio); - this.ComparisonBox.Controls.Add(this.GreaterThanOrEqualToRadio); - this.ComparisonBox.Controls.Add(this.LessThanOrEqualToRadio); - this.ComparisonBox.Controls.Add(this.GreaterThanRadio); - this.ComparisonBox.Controls.Add(this.LessThanRadio); - this.ComparisonBox.Location = new System.Drawing.Point(244, 196); - this.ComparisonBox.Name = "ComparisonBox"; - this.ComparisonBox.Size = new System.Drawing.Size(190, 159); - this.ComparisonBox.TabIndex = 12; - this.ComparisonBox.TabStop = false; - this.ComparisonBox.Text = "Comparison Operator"; - // - // DifferentByBox - // - this.DifferentByBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.DifferentByBox.Enabled = false; - this.DifferentByBox.Location = new System.Drawing.Point(88, 132); - this.DifferentByBox.MaxLength = 9; - this.DifferentByBox.Name = "DifferentByBox"; - this.DifferentByBox.Nullable = false; - this.DifferentByBox.Size = new System.Drawing.Size(55, 20); - this.DifferentByBox.TabIndex = 85; - this.DifferentByBox.TextChanged += new System.EventHandler(this.DifferentByBox_TextChanged); - // - // DifferentByRadio - // - this.DifferentByRadio.AutoSize = true; - this.DifferentByRadio.Location = new System.Drawing.Point(7, 134); - this.DifferentByRadio.Name = "DifferentByRadio"; - this.DifferentByRadio.Size = new System.Drawing.Size(82, 17); - this.DifferentByRadio.TabIndex = 80; - this.DifferentByRadio.Text = "Different by:"; - this.DifferentByRadio.UseVisualStyleBackColor = true; - this.DifferentByRadio.Click += new System.EventHandler(this.DifferentByRadio_Click); - // - // NotEqualToRadio - // - this.NotEqualToRadio.AutoSize = true; - this.NotEqualToRadio.Location = new System.Drawing.Point(7, 35); - this.NotEqualToRadio.Name = "NotEqualToRadio"; - this.NotEqualToRadio.Size = new System.Drawing.Size(88, 17); - this.NotEqualToRadio.TabIndex = 55; - this.NotEqualToRadio.Text = "Not Equal To"; - this.NotEqualToRadio.UseVisualStyleBackColor = true; - this.NotEqualToRadio.Click += new System.EventHandler(this.NotEqualToRadio_Click); - // - // EqualToRadio - // - this.EqualToRadio.AutoSize = true; - this.EqualToRadio.Checked = true; - this.EqualToRadio.Location = new System.Drawing.Point(7, 15); - this.EqualToRadio.Name = "EqualToRadio"; - this.EqualToRadio.Size = new System.Drawing.Size(68, 17); - this.EqualToRadio.TabIndex = 50; - this.EqualToRadio.TabStop = true; - this.EqualToRadio.Text = "Equal To"; - this.EqualToRadio.UseVisualStyleBackColor = true; - this.EqualToRadio.Click += new System.EventHandler(this.EqualToRadio_Click); - // - // GreaterThanOrEqualToRadio - // - this.GreaterThanOrEqualToRadio.AutoSize = true; - this.GreaterThanOrEqualToRadio.Location = new System.Drawing.Point(7, 113); - this.GreaterThanOrEqualToRadio.Name = "GreaterThanOrEqualToRadio"; - this.GreaterThanOrEqualToRadio.Size = new System.Drawing.Size(146, 17); - this.GreaterThanOrEqualToRadio.TabIndex = 75; - this.GreaterThanOrEqualToRadio.Text = "Greater Than or Equal To"; - this.GreaterThanOrEqualToRadio.UseVisualStyleBackColor = true; - this.GreaterThanOrEqualToRadio.Click += new System.EventHandler(this.GreaterThanOrEqualToRadio_Click); - // - // LessThanOrEqualToRadio - // - this.LessThanOrEqualToRadio.AutoSize = true; - this.LessThanOrEqualToRadio.Location = new System.Drawing.Point(7, 93); - this.LessThanOrEqualToRadio.Name = "LessThanOrEqualToRadio"; - this.LessThanOrEqualToRadio.Size = new System.Drawing.Size(133, 17); - this.LessThanOrEqualToRadio.TabIndex = 70; - this.LessThanOrEqualToRadio.Text = "Less Than or Equal To"; - this.LessThanOrEqualToRadio.UseVisualStyleBackColor = true; - this.LessThanOrEqualToRadio.Click += new System.EventHandler(this.LessThanOrEqualToRadio_Click); - // - // GreaterThanRadio - // - this.GreaterThanRadio.AutoSize = true; - this.GreaterThanRadio.Location = new System.Drawing.Point(7, 74); - this.GreaterThanRadio.Name = "GreaterThanRadio"; - this.GreaterThanRadio.Size = new System.Drawing.Size(88, 17); - this.GreaterThanRadio.TabIndex = 65; - this.GreaterThanRadio.Text = "Greater Than"; - this.GreaterThanRadio.UseVisualStyleBackColor = true; - this.GreaterThanRadio.Click += new System.EventHandler(this.GreaterThanRadio_Click); - // - // LessThanRadio - // - this.LessThanRadio.AutoSize = true; - this.LessThanRadio.Location = new System.Drawing.Point(7, 54); - this.LessThanRadio.Name = "LessThanRadio"; - this.LessThanRadio.Size = new System.Drawing.Size(75, 17); - this.LessThanRadio.TabIndex = 60; - this.LessThanRadio.Text = "Less Than"; - this.LessThanRadio.UseVisualStyleBackColor = true; - this.LessThanRadio.Click += new System.EventHandler(this.LessThanRadio_Click); - // - // SearchButton - // - this.SearchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.SearchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; - this.SearchButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.SearchButton.Location = new System.Drawing.Point(244, 409); - this.SearchButton.Name = "SearchButton"; - this.SearchButton.Size = new System.Drawing.Size(70, 23); - this.SearchButton.TabIndex = 100; - this.SearchButton.Text = "&Search"; - this.SearchButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.SearchButton.UseVisualStyleBackColor = true; - this.SearchButton.Click += new System.EventHandler(this.SearchMenuItem_Click); - // - // SizeDropdown - // - this.SizeDropdown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.SizeDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.SizeDropdown.FormattingEnabled = true; - this.SizeDropdown.Items.AddRange(new object[] { + this.toolStrip1.Location = new System.Drawing.Point(0, 24); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(445, 25); + this.toolStrip1.TabIndex = 11; + this.toolStrip1.Text = "toolStrip1"; + // + // DoSearchToolButton + // + this.DoSearchToolButton.Enabled = false; + this.DoSearchToolButton.Image = ((System.Drawing.Image)(resources.GetObject("DoSearchToolButton.Image"))); + this.DoSearchToolButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.DoSearchToolButton.Name = "DoSearchToolButton"; + this.DoSearchToolButton.Size = new System.Drawing.Size(65, 22); + this.DoSearchToolButton.Text = "Search "; + this.DoSearchToolButton.Click += new System.EventHandler(this.SearchMenuItem_Click); + // + // toolStripSeparator10 + // + this.toolStripSeparator10.Name = "toolStripSeparator10"; + this.toolStripSeparator10.Size = new System.Drawing.Size(6, 25); + // + // NewSearchToolButton + // + this.NewSearchToolButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; + this.NewSearchToolButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.NewSearchToolButton.Name = "NewSearchToolButton"; + this.NewSearchToolButton.Size = new System.Drawing.Size(51, 22); + this.NewSearchToolButton.Text = "New"; + this.NewSearchToolButton.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click); + // + // toolStripSeparator15 + // + this.toolStripSeparator15.Name = "toolStripSeparator15"; + this.toolStripSeparator15.Size = new System.Drawing.Size(6, 25); + // + // CopyValueToPrevToolBarItem + // + this.CopyValueToPrevToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.CopyValueToPrevToolBarItem.Enabled = false; + this.CopyValueToPrevToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; + this.CopyValueToPrevToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.CopyValueToPrevToolBarItem.Name = "CopyValueToPrevToolBarItem"; + this.CopyValueToPrevToolBarItem.Size = new System.Drawing.Size(23, 22); + this.CopyValueToPrevToolBarItem.Text = "Copy Value to Previous"; + this.CopyValueToPrevToolBarItem.Click += new System.EventHandler(this.CopyValueToPrevMenuItem_Click); + // + // ClearChangeCountsToolBarItem + // + this.ClearChangeCountsToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.ClearChangeCountsToolBarItem.Image = ((System.Drawing.Image)(resources.GetObject("ClearChangeCountsToolBarItem.Image"))); + this.ClearChangeCountsToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.ClearChangeCountsToolBarItem.Name = "ClearChangeCountsToolBarItem"; + this.ClearChangeCountsToolBarItem.Size = new System.Drawing.Size(23, 22); + this.ClearChangeCountsToolBarItem.Text = "C"; + this.ClearChangeCountsToolBarItem.ToolTipText = "Clear Change Counts"; + this.ClearChangeCountsToolBarItem.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click); + // + // toolStripSeparator16 + // + this.toolStripSeparator16.Name = "toolStripSeparator16"; + this.toolStripSeparator16.Size = new System.Drawing.Size(6, 25); + // + // RemoveToolBarItem + // + this.RemoveToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.RemoveToolBarItem.Enabled = false; + this.RemoveToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete; + this.RemoveToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.RemoveToolBarItem.Name = "RemoveToolBarItem"; + this.RemoveToolBarItem.Size = new System.Drawing.Size(23, 22); + this.RemoveToolBarItem.Text = "C&ut"; + this.RemoveToolBarItem.ToolTipText = "Eliminate Selected Items"; + this.RemoveToolBarItem.Click += new System.EventHandler(this.RemoveMenuItem_Click); + // + // AddToRamWatchToolBarItem + // + this.AddToRamWatchToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.AddToRamWatchToolBarItem.Enabled = false; + this.AddToRamWatchToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; + this.AddToRamWatchToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.AddToRamWatchToolBarItem.Name = "AddToRamWatchToolBarItem"; + this.AddToRamWatchToolBarItem.Size = new System.Drawing.Size(23, 22); + this.AddToRamWatchToolBarItem.Text = "Watch"; + this.AddToRamWatchToolBarItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click); + // + // PokeAddressToolBarItem + // + this.PokeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.PokeAddressToolBarItem.Enabled = false; + this.PokeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; + this.PokeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.PokeAddressToolBarItem.Name = "PokeAddressToolBarItem"; + this.PokeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); + this.PokeAddressToolBarItem.Text = "Poke"; + this.PokeAddressToolBarItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click); + // + // FreezeAddressToolBarItem + // + this.FreezeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.FreezeAddressToolBarItem.Enabled = false; + this.FreezeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; + this.FreezeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.FreezeAddressToolBarItem.Name = "FreezeAddressToolBarItem"; + this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(23, 22); + this.FreezeAddressToolBarItem.Text = "Freeze"; + this.FreezeAddressToolBarItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click); + // + // toolStripSeparator12 + // + this.toolStripSeparator12.Name = "toolStripSeparator12"; + this.toolStripSeparator12.Size = new System.Drawing.Size(6, 25); + // + // UndoToolBarButton + // + this.UndoToolBarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.UndoToolBarButton.Enabled = false; + this.UndoToolBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; + this.UndoToolBarButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.UndoToolBarButton.Name = "UndoToolBarButton"; + this.UndoToolBarButton.Size = new System.Drawing.Size(23, 22); + this.UndoToolBarButton.Text = "Undo Search"; + this.UndoToolBarButton.Click += new System.EventHandler(this.UndoMenuItem_Click); + // + // RedoToolBarItem + // + this.RedoToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.RedoToolBarItem.Enabled = false; + this.RedoToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.redo; + this.RedoToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.RedoToolBarItem.Name = "RedoToolBarItem"; + this.RedoToolBarItem.Size = new System.Drawing.Size(23, 22); + this.RedoToolBarItem.Text = "Redo"; + this.RedoToolBarItem.Click += new System.EventHandler(this.RedoMenuItem_Click); + // + // RebootToolBarSeparator + // + this.RebootToolBarSeparator.Name = "RebootToolBarSeparator"; + this.RebootToolBarSeparator.Size = new System.Drawing.Size(6, 25); + // + // RebootToolbarButton + // + this.RebootToolbarButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.RebootToolbarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot; + this.RebootToolbarButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.RebootToolbarButton.Name = "RebootToolbarButton"; + this.RebootToolbarButton.Size = new System.Drawing.Size(23, 22); + this.RebootToolbarButton.Text = "A new search needs to be started in order for these changes to take effect"; + this.RebootToolbarButton.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click); + // + // ComparisonBox + // + this.ComparisonBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ComparisonBox.Controls.Add(this.DifferentByBox); + this.ComparisonBox.Controls.Add(this.DifferentByRadio); + this.ComparisonBox.Controls.Add(this.NotEqualToRadio); + this.ComparisonBox.Controls.Add(this.EqualToRadio); + this.ComparisonBox.Controls.Add(this.GreaterThanOrEqualToRadio); + this.ComparisonBox.Controls.Add(this.LessThanOrEqualToRadio); + this.ComparisonBox.Controls.Add(this.GreaterThanRadio); + this.ComparisonBox.Controls.Add(this.LessThanRadio); + this.ComparisonBox.Location = new System.Drawing.Point(244, 196); + this.ComparisonBox.Name = "ComparisonBox"; + this.ComparisonBox.Size = new System.Drawing.Size(190, 159); + this.ComparisonBox.TabIndex = 12; + this.ComparisonBox.TabStop = false; + this.ComparisonBox.Text = "Comparison Operator"; + // + // DifferentByBox + // + this.DifferentByBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.DifferentByBox.Enabled = false; + this.DifferentByBox.Location = new System.Drawing.Point(88, 132); + this.DifferentByBox.MaxLength = 9; + this.DifferentByBox.Name = "DifferentByBox"; + this.DifferentByBox.Nullable = false; + this.DifferentByBox.Size = new System.Drawing.Size(55, 20); + this.DifferentByBox.TabIndex = 85; + this.DifferentByBox.TextChanged += new System.EventHandler(this.DifferentByBox_TextChanged); + // + // DifferentByRadio + // + this.DifferentByRadio.AutoSize = true; + this.DifferentByRadio.Location = new System.Drawing.Point(7, 134); + this.DifferentByRadio.Name = "DifferentByRadio"; + this.DifferentByRadio.Size = new System.Drawing.Size(82, 17); + this.DifferentByRadio.TabIndex = 80; + this.DifferentByRadio.Text = "Different by:"; + this.DifferentByRadio.UseVisualStyleBackColor = true; + this.DifferentByRadio.Click += new System.EventHandler(this.DifferentByRadio_Click); + // + // NotEqualToRadio + // + this.NotEqualToRadio.AutoSize = true; + this.NotEqualToRadio.Location = new System.Drawing.Point(7, 35); + this.NotEqualToRadio.Name = "NotEqualToRadio"; + this.NotEqualToRadio.Size = new System.Drawing.Size(88, 17); + this.NotEqualToRadio.TabIndex = 55; + this.NotEqualToRadio.Text = "Not Equal To"; + this.NotEqualToRadio.UseVisualStyleBackColor = true; + this.NotEqualToRadio.Click += new System.EventHandler(this.NotEqualToRadio_Click); + // + // EqualToRadio + // + this.EqualToRadio.AutoSize = true; + this.EqualToRadio.Checked = true; + this.EqualToRadio.Location = new System.Drawing.Point(7, 15); + this.EqualToRadio.Name = "EqualToRadio"; + this.EqualToRadio.Size = new System.Drawing.Size(68, 17); + this.EqualToRadio.TabIndex = 50; + this.EqualToRadio.TabStop = true; + this.EqualToRadio.Text = "Equal To"; + this.EqualToRadio.UseVisualStyleBackColor = true; + this.EqualToRadio.Click += new System.EventHandler(this.EqualToRadio_Click); + // + // GreaterThanOrEqualToRadio + // + this.GreaterThanOrEqualToRadio.AutoSize = true; + this.GreaterThanOrEqualToRadio.Location = new System.Drawing.Point(7, 113); + this.GreaterThanOrEqualToRadio.Name = "GreaterThanOrEqualToRadio"; + this.GreaterThanOrEqualToRadio.Size = new System.Drawing.Size(146, 17); + this.GreaterThanOrEqualToRadio.TabIndex = 75; + this.GreaterThanOrEqualToRadio.Text = "Greater Than or Equal To"; + this.GreaterThanOrEqualToRadio.UseVisualStyleBackColor = true; + this.GreaterThanOrEqualToRadio.Click += new System.EventHandler(this.GreaterThanOrEqualToRadio_Click); + // + // LessThanOrEqualToRadio + // + this.LessThanOrEqualToRadio.AutoSize = true; + this.LessThanOrEqualToRadio.Location = new System.Drawing.Point(7, 93); + this.LessThanOrEqualToRadio.Name = "LessThanOrEqualToRadio"; + this.LessThanOrEqualToRadio.Size = new System.Drawing.Size(133, 17); + this.LessThanOrEqualToRadio.TabIndex = 70; + this.LessThanOrEqualToRadio.Text = "Less Than or Equal To"; + this.LessThanOrEqualToRadio.UseVisualStyleBackColor = true; + this.LessThanOrEqualToRadio.Click += new System.EventHandler(this.LessThanOrEqualToRadio_Click); + // + // GreaterThanRadio + // + this.GreaterThanRadio.AutoSize = true; + this.GreaterThanRadio.Location = new System.Drawing.Point(7, 74); + this.GreaterThanRadio.Name = "GreaterThanRadio"; + this.GreaterThanRadio.Size = new System.Drawing.Size(88, 17); + this.GreaterThanRadio.TabIndex = 65; + this.GreaterThanRadio.Text = "Greater Than"; + this.GreaterThanRadio.UseVisualStyleBackColor = true; + this.GreaterThanRadio.Click += new System.EventHandler(this.GreaterThanRadio_Click); + // + // LessThanRadio + // + this.LessThanRadio.AutoSize = true; + this.LessThanRadio.Location = new System.Drawing.Point(7, 54); + this.LessThanRadio.Name = "LessThanRadio"; + this.LessThanRadio.Size = new System.Drawing.Size(75, 17); + this.LessThanRadio.TabIndex = 60; + this.LessThanRadio.Text = "Less Than"; + this.LessThanRadio.UseVisualStyleBackColor = true; + this.LessThanRadio.Click += new System.EventHandler(this.LessThanRadio_Click); + // + // SearchButton + // + this.SearchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SearchButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; + this.SearchButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.SearchButton.Location = new System.Drawing.Point(244, 409); + this.SearchButton.Name = "SearchButton"; + this.SearchButton.Size = new System.Drawing.Size(70, 23); + this.SearchButton.TabIndex = 100; + this.SearchButton.Text = "&Search"; + this.SearchButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.SearchButton.UseVisualStyleBackColor = true; + this.SearchButton.Click += new System.EventHandler(this.SearchMenuItem_Click); + // + // SizeDropdown + // + this.SizeDropdown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.SizeDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.SizeDropdown.FormattingEnabled = true; + this.SizeDropdown.Items.AddRange(new object[] { "1 Byte", "2 Byte", "4 Byte"}); - this.SizeDropdown.Location = new System.Drawing.Point(244, 374); - this.SizeDropdown.Name = "SizeDropdown"; - this.SizeDropdown.Size = new System.Drawing.Size(73, 21); - this.SizeDropdown.TabIndex = 90; - this.SizeDropdown.SelectedIndexChanged += new System.EventHandler(this.SizeDropdown_SelectedIndexChanged); - // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(244, 358); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(27, 13); - this.label1.TabIndex = 97; - this.label1.Text = "Size"; - // - // label2 - // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(327, 358); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(41, 13); - this.label2.TabIndex = 99; - this.label2.Text = "Display"; - // - // DisplayTypeDropdown - // - this.DisplayTypeDropdown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.DisplayTypeDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.DisplayTypeDropdown.FormattingEnabled = true; - this.DisplayTypeDropdown.Items.AddRange(new object[] { + this.SizeDropdown.Location = new System.Drawing.Point(244, 374); + this.SizeDropdown.Name = "SizeDropdown"; + this.SizeDropdown.Size = new System.Drawing.Size(73, 21); + this.SizeDropdown.TabIndex = 90; + this.SizeDropdown.SelectedIndexChanged += new System.EventHandler(this.SizeDropdown_SelectedIndexChanged); + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(244, 358); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(27, 13); + this.label1.TabIndex = 97; + this.label1.Text = "Size"; + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(327, 358); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(41, 13); + this.label2.TabIndex = 99; + this.label2.Text = "Display"; + // + // DisplayTypeDropdown + // + this.DisplayTypeDropdown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.DisplayTypeDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.DisplayTypeDropdown.FormattingEnabled = true; + this.DisplayTypeDropdown.Items.AddRange(new object[] { "1 Byte", "2 Byte", "4 Byte"}); - this.DisplayTypeDropdown.Location = new System.Drawing.Point(327, 374); - this.DisplayTypeDropdown.Name = "DisplayTypeDropdown"; - this.DisplayTypeDropdown.Size = new System.Drawing.Size(107, 21); - this.DisplayTypeDropdown.TabIndex = 95; - this.DisplayTypeDropdown.SelectedIndexChanged += new System.EventHandler(this.DisplayTypeDropdown_SelectedIndexChanged); - // - // RamSearch - // - this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(445, 459); - this.Controls.Add(this.label2); - this.Controls.Add(this.DisplayTypeDropdown); - this.Controls.Add(this.label1); - this.Controls.Add(this.SizeDropdown); - this.Controls.Add(this.SearchButton); - this.Controls.Add(this.AutoSearchCheckBox); - this.Controls.Add(this.ComparisonBox); - this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.MessageLabel); - this.Controls.Add(this.MemDomainLabel); - this.Controls.Add(this.CompareToBox); - this.Controls.Add(this.WatchListView); - this.Controls.Add(this.TotalSearchLabel); - this.Controls.Add(this.menuStrip1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.menuStrip1; - this.MinimumSize = new System.Drawing.Size(291, 400); - this.Name = "RamSearch"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - 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); - this.DragEnter += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragEnter); - this.contextMenuStrip1.ResumeLayout(false); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.CompareToBox.ResumeLayout(false); - this.CompareToBox.PerformLayout(); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.ComparisonBox.ResumeLayout(false); - this.ComparisonBox.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.DisplayTypeDropdown.Location = new System.Drawing.Point(327, 374); + this.DisplayTypeDropdown.Name = "DisplayTypeDropdown"; + this.DisplayTypeDropdown.Size = new System.Drawing.Size(107, 21); + this.DisplayTypeDropdown.TabIndex = 95; + this.DisplayTypeDropdown.SelectedIndexChanged += new System.EventHandler(this.DisplayTypeDropdown_SelectedIndexChanged); + // + // RamSearch + // + this.AllowDrop = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(445, 459); + this.Controls.Add(this.label2); + this.Controls.Add(this.DisplayTypeDropdown); + this.Controls.Add(this.label1); + this.Controls.Add(this.SizeDropdown); + this.Controls.Add(this.SearchButton); + this.Controls.Add(this.AutoSearchCheckBox); + this.Controls.Add(this.ComparisonBox); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.MessageLabel); + this.Controls.Add(this.MemDomainLabel); + this.Controls.Add(this.CompareToBox); + this.Controls.Add(this.WatchListView); + this.Controls.Add(this.TotalSearchLabel); + this.Controls.Add(this.menuStrip1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MainMenuStrip = this.menuStrip1; + this.MinimumSize = new System.Drawing.Size(291, 400); + this.Name = "RamSearch"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + 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); + this.DragEnter += new System.Windows.Forms.DragEventHandler(this.NewRamSearch_DragEnter); + this.ListViewContextMenu.ResumeLayout(false); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.CompareToBox.ResumeLayout(false); + this.CompareToBox.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.ComparisonBox.ResumeLayout(false); + this.ComparisonBox.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -1441,7 +1441,7 @@ private System.Windows.Forms.ToolStripMenuItem TruncateFromFileMenuItem; private System.Windows.Forms.ToolStripMenuItem ExcludeRamWatchMenuItem; private System.Windows.Forms.ToolStripMenuItem CopyValueToPrevMenuItem; - private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ContextMenuStrip ListViewContextMenu; private System.Windows.Forms.ToolStripMenuItem NewSearchContextMenuItem; private System.Windows.Forms.ToolStripSeparator ContextMenuSeparator1; private System.Windows.Forms.ToolStripMenuItem DoSearchContextMenuItem; @@ -1474,9 +1474,9 @@ private System.Windows.Forms.ToolStripMenuItem MemoryDomainsSubMenu; private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; private System.Windows.Forms.ToolStripMenuItem sizeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem _1ByteMenuItem; - private System.Windows.Forms.ToolStripMenuItem _2ByteMenuItem; - private System.Windows.Forms.ToolStripMenuItem _4ByteMenuItem; + private System.Windows.Forms.ToolStripMenuItem ByteMenuItem; + private System.Windows.Forms.ToolStripMenuItem WordMenuItem; + private System.Windows.Forms.ToolStripMenuItem DWordMenuItem; private System.Windows.Forms.ToolStripMenuItem DisplayTypeSubMenu; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem BigEndianMenuItem; diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 49fb74578c..91a7fa91ba 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -2,24 +2,23 @@ using System.Collections.Generic; using System.ComponentModel; using System.Drawing; +using System.Globalization; +using System.IO; using System.Linq; using System.Reflection; using System.Text; using System.Windows.Forms; -using System.IO; -using System.Globalization; using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk { /// - /// A winform designed to search through ram values + /// A form designed to search through ram values /// public partial class RamSearch : Form, IToolForm { - //TODO: DoSearch grabs the state of widgets and passes it to the engine before running, so rip out code that is attempting to keep the state up to date through change events - + // TODO: DoSearch grabs the state of widgets and passes it to the engine before running, so rip out code that is attempting to keep the state up to date through change events private readonly Dictionary _defaultColumnWidths = new Dictionary { { WatchList.ADDRESS, 60 }, @@ -34,20 +33,27 @@ namespace BizHawk.Client.EmuHawk private RamSearchEngine _searches; private RamSearchEngine.Settings _settings; - private int _defaultWidth; //For saving the default size of the dialog, so the user can restore if desired + private int _defaultWidth; private int _defaultHeight; private string _sortedColumn = String.Empty; private bool _sortReverse; private bool _forcePreviewClear; private bool _autoSearch; - 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! + 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 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 bool AskSave() { return true; } - public bool UpdateBefore { get { return false; } } + public bool AskSave() + { + return true; + } + + public bool UpdateBefore + { + get { return false; } + } #region Initialize, Load, and Save @@ -187,8 +193,7 @@ namespace BizHawk.Client.EmuHawk private void LoadConfigSettings() { - //Size and Positioning - _defaultWidth = Size.Width; //Save these first so that the user can restore to its original size + _defaultWidth = Size.Width; _defaultHeight = Size.Height; if (Global.Config.RamSearchSaveWindowPosition && Global.Config.RamSearchWndx >= 0 && Global.Config.RamSearchWndy >= 0) @@ -228,7 +233,10 @@ namespace BizHawk.Client.EmuHawk public void Restart() { - if (!IsHandleCreated || IsDisposed) return; + if (!IsHandleCreated || IsDisposed) + { + return; + } _settings.Domain = Global.Emulator.MemoryDomains.MainMemory; MessageLabel.Text = "Search restarted"; @@ -515,13 +523,13 @@ namespace BizHawk.Client.EmuHawk private void ColumnPositions() { - var Columns = Global.Config.RamSearchColumnIndexes + var columns = Global.Config.RamSearchColumnIndexes .Where(x => WatchListView.Columns.ContainsKey(x.Key)) .OrderBy(x => x.Value).ToList(); - for (var i = 0; i < Columns.Count; i++) + for (var i = 0; i < columns.Count; i++) { - WatchListView.Columns[Columns[i].Key].DisplayIndex = i; + WatchListView.Columns[columns[i].Key].DisplayIndex = i; } } @@ -575,6 +583,7 @@ namespace BizHawk.Client.EmuHawk { SpecificValueBox.Text = "0"; } + SpecificValueBox.Type = _settings.Type = type; _searches.SetType(type); @@ -610,7 +619,7 @@ namespace BizHawk.Client.EmuHawk } _dropdownDontfire = true; - switch(size) + switch (size) { case Watch.WatchSize.Byte: SizeDropdown.SelectedIndex = 0; @@ -622,6 +631,7 @@ namespace BizHawk.Client.EmuHawk SizeDropdown.SelectedIndex = 2; break; } + PopulateTypeDropDown(); _dropdownDontfire = false; SpecificValueBox.Type = _settings.Type; @@ -770,14 +780,11 @@ namespace BizHawk.Client.EmuHawk private void AddToRamWatch() { - if (SelectedIndices.Count > 0) + var watches = SelectedWatches.ToList(); + if (watches.Any()) { GlobalWin.Tools.LoadRamWatch(true); - foreach(var watch in SelectedWatches) - { - GlobalWin.Tools.RamWatch.AddWatch(watch); - } - + watches.ForEach(GlobalWin.Tools.RamWatch.AddWatch); if (Global.Config.RamSearchAlwaysExcludeRamWatch) { RemoveRamWatchesFromList(); @@ -850,7 +857,7 @@ namespace BizHawk.Client.EmuHawk private void GoToSpecifiedAddress() { WatchListView.SelectedIndices.Clear(); - var prompt = new InputPrompt {Text = "Go to Address", _Location = GetPromptPoint()}; + var prompt = new InputPrompt { Text = "Go to Address", _Location = GetPromptPoint() }; prompt.SetMessage("Enter a hexadecimal value"); prompt.ShowHawkDialog(); @@ -897,7 +904,7 @@ namespace BizHawk.Client.EmuHawk { if (!String.IsNullOrWhiteSpace(_currentFileName)) { - var watches = new WatchList(_settings.Domain) {CurrentFileName = _currentFileName}; + var watches = new WatchList(_settings.Domain) { CurrentFileName = _currentFileName }; for (var i = 0; i < _searches.Count; i++) { watches.Add(_searches[i]); @@ -925,7 +932,7 @@ namespace BizHawk.Client.EmuHawk private void SaveAsMenuItem_Click(object sender, EventArgs e) { - var watches = new WatchList(_settings.Domain) {CurrentFileName = _currentFileName}; + var watches = new WatchList(_settings.Domain) { CurrentFileName = _currentFileName }; for (var i = 0; i < _searches.Count; i++) { watches.Add(_searches[i]); @@ -968,9 +975,9 @@ namespace BizHawk.Client.EmuHawk private void SizeSubMenu_DropDownOpened(object sender, EventArgs e) { - _1ByteMenuItem.Checked = _settings.Size == Watch.WatchSize.Byte; - _2ByteMenuItem.Checked = _settings.Size == Watch.WatchSize.Word; - _4ByteMenuItem.Checked = _settings.Size == Watch.WatchSize.DWord; + ByteMenuItem.Checked = _settings.Size == Watch.WatchSize.Byte; + WordMenuItem.Checked = _settings.Size == Watch.WatchSize.Word; + DWordMenuItem.Checked = _settings.Size == Watch.WatchSize.DWord; } private void DisplayTypeSubMenu_DropDownOpened(object sender, EventArgs e) @@ -1025,17 +1032,17 @@ namespace BizHawk.Client.EmuHawk SetToFastMode(); } - private void _1ByteMenuItem_Click(object sender, EventArgs e) + private void ByteMenuItem_Click(object sender, EventArgs e) { SetSize(Watch.WatchSize.Byte); } - private void _2ByteMenuItem_Click(object sender, EventArgs e) + private void WordMenuItem_Click(object sender, EventArgs e) { SetSize(Watch.WatchSize.Word); } - private void _4ByteMenuItem_Click(object sender, EventArgs e) + private void DWordMenuItem_Click_Click(object sender, EventArgs e) { SetSize(Watch.WatchSize.DWord); } @@ -1314,7 +1321,7 @@ namespace BizHawk.Client.EmuHawk #region ContextMenu and Toolbar - private void contextMenuStrip1_Opening(object sender, CancelEventArgs e) + private void ListViewContextMenu_Opening(object sender, CancelEventArgs e) { DoSearchContextMenuItem.Enabled = _searches.Count > 0; @@ -1329,7 +1336,7 @@ namespace BizHawk.Client.EmuHawk UnfreezeAllContextMenuItem.Visible = Global.CheatList.ActiveCount > 0; - ContextMenuSeparator3.Visible = (SelectedIndices.Count > 0) || (Global.CheatList.ActiveCount > 0); + ContextMenuSeparator3.Visible = (SelectedIndices.Any()) || (Global.CheatList.ActiveCount > 0); var allCheats = true; foreach (var index in SelectedIndices) diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.resx b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.resx index 1fa045f760..acb812c494 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.resx +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.resx @@ -120,7 +120,7 @@ False - + 457, 17 diff --git a/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.Designer.cs index 2b2b466b60..0e76a050d8 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.Designer.cs @@ -89,7 +89,7 @@ this.OK.TabIndex = 30; this.OK.Text = "Ok"; this.OK.UseVisualStyleBackColor = true; - this.OK.Click += new System.EventHandler(this.OK_Click); + this.OK.Click += new System.EventHandler(this.Ok_Click); // // Cancel // diff --git a/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs index ccb0dd842f..cf0d79db64 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs @@ -59,6 +59,7 @@ namespace BizHawk.Client.EmuHawk SizeDropDown.SelectedItem = SizeDropDown.Items[2]; break; } + var index = DisplayTypeDropDown.Items.IndexOf(Watch.DisplayTypeToString(_watchList[0].Type)); DisplayTypeDropDown.SelectedItem = DisplayTypeDropDown.Items[index]; @@ -95,6 +96,7 @@ namespace BizHawk.Client.EmuHawk { _watchList.AddRange(watches); } + _mode = mode; ToolHelpers.PopulateMemoryDomainDropdown(ref DomainDropDown, domain ?? Global.Emulator.MemoryDomains.MainMemory); SetTitle(); @@ -145,6 +147,7 @@ namespace BizHawk.Client.EmuHawk DisplayTypeDropDown.Items.AddRange(DWordWatch.ValidTypes.ConvertAll(e => Watch.DisplayTypeToString(e)).ToArray()); break; } + DisplayTypeDropDown.SelectedItem = DisplayTypeDropDown.Items[0]; } @@ -154,7 +157,7 @@ namespace BizHawk.Client.EmuHawk { if (_watchList.Count > 1) { - //Aggregate state + // Aggregate state var hasBig = _watchList.Any(x => x.BigEndian); var hasLittle = _watchList.Any(x => x.BigEndian == false); @@ -192,7 +195,7 @@ namespace BizHawk.Client.EmuHawk Close(); } - private void OK_Click(object sender, EventArgs e) + private void Ok_Click(object sender, EventArgs e) { DialogResult = DialogResult.OK; @@ -217,6 +220,7 @@ namespace BizHawk.Client.EmuHawk _watchList.Add(new DWordWatch(domain, address, type, bigendian, notes)); break; } + break; case Mode.Edit: DoEdit(); @@ -235,6 +239,7 @@ namespace BizHawk.Client.EmuHawk watch.Notes, watch.BigEndian)); } + DoEdit(); break; } @@ -251,10 +256,10 @@ namespace BizHawk.Client.EmuHawk if (_changedSize) { - for(var i = 0; i < _watchList.Count; i++) + for (var i = 0; i < _watchList.Count; i++) { var size = Watch.WatchSize.Byte; - switch(SizeDropDown.SelectedIndex) + switch (SizeDropDown.SelectedIndex) { case 0: size = Watch.WatchSize.Byte; @@ -266,6 +271,7 @@ namespace BizHawk.Client.EmuHawk size = Watch.WatchSize.DWord; break; } + _watchList[i] = Watch.GenerateWatch( _watchList[i].Domain, _watchList.Count == 1 ? AddressBox.ToRawInt() ?? 0 : _watchList[i].Address ?? 0, @@ -276,10 +282,12 @@ namespace BizHawk.Client.EmuHawk ); } } + if (_changedDisplayType) { _watchList.ForEach(x => x.Type = Watch.StringToDisplayType(DisplayTypeDropDown.SelectedItem.ToString())); } + if (BigEndianCheckBox.CheckState != CheckState.Indeterminate) { _watchList.ForEach(x => x.BigEndian = BigEndianCheckBox.Checked);