From 393dd9dcfe7602f11e9d9d79bb6773df8ac46bc6 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 2 Jun 2012 21:48:09 +0000
Subject: [PATCH] Ram Watch/Search, Hex Editor - set endian based on the
 endianness of the memory domain by default

---
 BizHawk.MultiClient/tools/HexEditor.cs        |  4 ++
 BizHawk.MultiClient/tools/RamSearch.cs        | 40 +++++++++++++------
 BizHawk.MultiClient/tools/RamWatch.cs         |  1 +
 BizHawk.MultiClient/tools/RamWatchNewWatch.cs | 19 ++++++---
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs
index ede183f90b..a0c7fe181a 100644
--- a/BizHawk.MultiClient/tools/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.cs
@@ -258,6 +258,10 @@ namespace BizHawk.MultiClient
 		public void SetMemoryDomain(MemoryDomain d)
 		{
 			Domain = d;
+			if (d.Endian == Endian.Big)
+				BigEndian = true;
+			else
+				BigEndian = false;
 			maxRow = Domain.Size / 2;
 			SetUpScrollBar();
 			vScrollBar1.Value = 0;
diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs
index d0f9fa22cb..d29a02e145 100644
--- a/BizHawk.MultiClient/tools/RamSearch.cs
+++ b/BizHawk.MultiClient/tools/RamSearch.cs
@@ -100,6 +100,18 @@ namespace BizHawk.MultiClient
 			SetMemoryDomainMenu();
 		}
 
+		private void SetEndian()
+		{
+			if (Domain.Endian == Endian.Big)
+			{
+				SetBigEndian();
+			}
+			else
+			{
+				SetLittleEndian();
+			}
+		}
+
 		private void LoadConfigSettings()
 		{
 			ColumnPositionSet();
@@ -111,16 +123,7 @@ namespace BizHawk.MultiClient
 			defaultPrevWidth = SearchListView.Columns[Global.Config.RamSearchPrevIndex].Width;
 			defaultChangesWidth = SearchListView.Columns[Global.Config.RamSearchChangesIndex].Width;
 
-			if (Domain.Endian == Endian.Big)
-			{
-				bigEndianToolStripMenuItem.Checked = true;
-				littleEndianToolStripMenuItem.Checked = false;
-			}
-			else
-			{
-				bigEndianToolStripMenuItem.Checked = false;
-				littleEndianToolStripMenuItem.Checked = true;
-			}
+			SetEndian();
 
 			if (Global.Config.RamSearchSaveWindowPosition && Global.Config.RamSearchWndx >= 0 && Global.Config.RamSearchWndy >= 0)
 				this.Location = new Point(Global.Config.RamSearchWndx, Global.Config.RamSearchWndy);
@@ -175,6 +178,7 @@ namespace BizHawk.MultiClient
 		private void SetMemoryDomainNew(int pos)
 		{
 			SetMemoryDomain(pos);
+			SetEndian();
 			StartNewSearch();
 		}
 
@@ -1218,16 +1222,26 @@ namespace BizHawk.MultiClient
 			SetSpecificValueBoxMaxLength();
 		}
 
-		private void bigEndianToolStripMenuItem_Click(object sender, EventArgs e)
+		private void SetLittleEndian()
+		{
+			bigEndianToolStripMenuItem.Checked = false;
+			littleEndianToolStripMenuItem.Checked = true;
+		}
+
+		private void SetBigEndian()
 		{
 			bigEndianToolStripMenuItem.Checked = true;
 			littleEndianToolStripMenuItem.Checked = false;
 		}
 
+		private void bigEndianToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			SetBigEndian();
+		}
+
 		private void littleEndianToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			bigEndianToolStripMenuItem.Checked = false;
-			littleEndianToolStripMenuItem.Checked = true;
+			SetLittleEndian();
 		}
 
 		private void AutoSearchCheckBox_CheckedChanged(object sender, EventArgs e)
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index cadd9d5cec..d7458979e1 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -428,6 +428,7 @@ namespace BizHawk.MultiClient
 
 			RamWatchNewWatch r = new RamWatchNewWatch();
 			r.location = GetPromptPoint();
+			r.SetEndian(Domain.Endian);
 			Global.Sound.StopSound();
 			r.ShowDialog();
 			Global.Sound.StartSound();
diff --git a/BizHawk.MultiClient/tools/RamWatchNewWatch.cs b/BizHawk.MultiClient/tools/RamWatchNewWatch.cs
index f378ef5910..ec4d59cde2 100644
--- a/BizHawk.MultiClient/tools/RamWatchNewWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatchNewWatch.cs
@@ -76,6 +76,18 @@ namespace BizHawk.MultiClient
 				LittleEndianRadio.Checked = true;
 		}
 
+		public void SetEndian(Endian endian)
+		{
+			if (endian == Endian.Big)
+			{
+				BigEndianRadio.Checked = true;
+			}
+			else
+			{
+				LittleEndianRadio.Checked = true;
+			}
+		}
+
 		private void RamWatchNewWatch_Load(object sender, EventArgs e)
 		{
 			if (!customSetup)
@@ -83,14 +95,9 @@ namespace BizHawk.MultiClient
 				Watch w = new Watch();
 				SetTypeRadio(w.type);
 				SetSignedRadio(w.signed);
-
 				AddressBox.Text = "0000";
-
-				if (w.bigendian == true)
-					BigEndianRadio.Checked = true;
-				else
-					LittleEndianRadio.Checked = true;
 			}
+
 			if (location.X > 0 && location.Y > 0)
 				this.Location = location;
 		}