From 250434b0ce050f51d05c56e2e2e7461d4f271767 Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Sun, 23 Jan 2011 19:52:04 +0000
Subject: [PATCH] Add poke image for tool bars and added to ram search & ram
 watch

---
 .../BizHawk.MultiClient.csproj                |   3 +
 .../Properties/Resources.Designer.cs          |   7 ++
 BizHawk.MultiClient/Properties/Resources.resx |   3 +
 BizHawk.MultiClient/images/poke.png           | Bin 0 -> 319 bytes
 .../tools/RamSearch.Designer.cs               |  64 +++++++++---------
 BizHawk.MultiClient/tools/RamSearch.resx      |  15 ----
 .../tools/RamWatch.Designer.cs                |  25 +++++++
 BizHawk.MultiClient/tools/RamWatch.cs         |  17 +++++
 8 files changed, 87 insertions(+), 47 deletions(-)
 create mode 100644 BizHawk.MultiClient/images/poke.png

diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 67530d66bc..22da652e71 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -176,6 +176,9 @@
   <ItemGroup>
     <None Include="images\FindHS.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="images\poke.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs
index 8631fbfcf6..8b7306e341 100644
--- a/BizHawk.MultiClient/Properties/Resources.Designer.cs
+++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs
@@ -94,5 +94,12 @@ namespace BizHawk.MultiClient.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        internal static System.Drawing.Bitmap poke {
+            get {
+                object obj = ResourceManager.GetObject("poke", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx
index 42019fc1cd..d65269f85f 100644
--- a/BizHawk.MultiClient/Properties/Resources.resx
+++ b/BizHawk.MultiClient/Properties/Resources.resx
@@ -133,4 +133,7 @@
   <data name="InserSeparator" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\InserSeparator.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="poke" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\poke.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BizHawk.MultiClient/images/poke.png b/BizHawk.MultiClient/images/poke.png
new file mode 100644
index 0000000000000000000000000000000000000000..366f206e552e2d199e79927d649cbc7ffdcb2e29
GIT binary patch
literal 319
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<@^mK6yskk*~@<zU91%bBneme}d
z^)m0aYdP;Nk&<mKVQy|NE9=9fxu@Z^>4asSD;vC=_==97KVHu$Aea=K-OEt+bN=oF
zeTF>E_B-1TOtX#iuaWL;=lr#=oNG$Zj`;kOiA>RlEZvu0spP+8(yDWM(%P7S1-a4f
z2PCZ17x{W?8iqVpo$>sprhrq^`OjP>vCos{Jx^@jwqf7)#R5#pvA0w*W*s}48u>`~
z)6DQtQNPO~su8)bcKxfBy8oP$OT=}fRmilbhD^z4x)NlLuQ=e|z{v3X)@HTf*V=VJ
P&oOwq`njxgN@xNA=TUo^

literal 0
HcmV?d00001

diff --git a/BizHawk.MultiClient/tools/RamSearch.Designer.cs b/BizHawk.MultiClient/tools/RamSearch.Designer.cs
index 11bdef0cbc..8037b96aa2 100644
--- a/BizHawk.MultiClient/tools/RamSearch.Designer.cs
+++ b/BizHawk.MultiClient/tools/RamSearch.Designer.cs
@@ -30,16 +30,16 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RamSearch));
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+            this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.SearchListBox = new System.Windows.Forms.ListBox();
+            this.TotalSearchLabel = new System.Windows.Forms.Label();
             this.newToolStripButton = new System.Windows.Forms.ToolStripButton();
             this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
             this.saveToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
             this.cutToolStripButton = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.WatchtoolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.PoketoolStripButton1 = new System.Windows.Forms.ToolStripButton();
-            this.SearchListBox = new System.Windows.Forms.ListBox();
-            this.TotalSearchLabel = new System.Windows.Forms.Label();
             this.toolStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -60,6 +60,33 @@
             this.toolStrip1.TabIndex = 0;
             this.toolStrip1.Text = "toolStrip1";
             // 
+            // toolStripSeparator
+            // 
+            this.toolStripSeparator.Name = "toolStripSeparator";
+            this.toolStripSeparator.Size = new System.Drawing.Size(6, 25);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+            // 
+            // SearchListBox
+            // 
+            this.SearchListBox.FormattingEnabled = true;
+            this.SearchListBox.Location = new System.Drawing.Point(12, 52);
+            this.SearchListBox.Name = "SearchListBox";
+            this.SearchListBox.Size = new System.Drawing.Size(150, 394);
+            this.SearchListBox.TabIndex = 1;
+            // 
+            // TotalSearchLabel
+            // 
+            this.TotalSearchLabel.AutoSize = true;
+            this.TotalSearchLabel.Location = new System.Drawing.Point(13, 33);
+            this.TotalSearchLabel.Name = "TotalSearchLabel";
+            this.TotalSearchLabel.Size = new System.Drawing.Size(64, 13);
+            this.TotalSearchLabel.TabIndex = 2;
+            this.TotalSearchLabel.Text = "0 addresses";
+            // 
             // newToolStripButton
             // 
             this.newToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -90,11 +117,6 @@
             this.saveToolStripButton.Text = "&Save";
             this.saveToolStripButton.ToolTipText = "Save Watch List";
             // 
-            // toolStripSeparator
-            // 
-            this.toolStripSeparator.Name = "toolStripSeparator";
-            this.toolStripSeparator.Size = new System.Drawing.Size(6, 25);
-            // 
             // cutToolStripButton
             // 
             this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -105,11 +127,6 @@
             this.cutToolStripButton.Text = "C&ut";
             this.cutToolStripButton.ToolTipText = "Eliminate Selected Items";
             // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
-            // 
             // WatchtoolStripButton1
             // 
             this.WatchtoolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -122,29 +139,12 @@
             // PoketoolStripButton1
             // 
             this.PoketoolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.PoketoolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("PoketoolStripButton1.Image")));
+            this.PoketoolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
             this.PoketoolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.PoketoolStripButton1.Name = "PoketoolStripButton1";
             this.PoketoolStripButton1.Size = new System.Drawing.Size(23, 22);
             this.PoketoolStripButton1.Text = "Poke";
             // 
-            // SearchListBox
-            // 
-            this.SearchListBox.FormattingEnabled = true;
-            this.SearchListBox.Location = new System.Drawing.Point(12, 52);
-            this.SearchListBox.Name = "SearchListBox";
-            this.SearchListBox.Size = new System.Drawing.Size(150, 394);
-            this.SearchListBox.TabIndex = 1;
-            // 
-            // TotalSearchLabel
-            // 
-            this.TotalSearchLabel.AutoSize = true;
-            this.TotalSearchLabel.Location = new System.Drawing.Point(13, 33);
-            this.TotalSearchLabel.Name = "TotalSearchLabel";
-            this.TotalSearchLabel.Size = new System.Drawing.Size(64, 13);
-            this.TotalSearchLabel.TabIndex = 2;
-            this.TotalSearchLabel.Text = "0 addresses";
-            // 
             // RamSearch
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/BizHawk.MultiClient/tools/RamSearch.resx b/BizHawk.MultiClient/tools/RamSearch.resx
index 28bc54506f..811c4c5227 100644
--- a/BizHawk.MultiClient/tools/RamSearch.resx
+++ b/BizHawk.MultiClient/tools/RamSearch.resx
@@ -163,21 +163,6 @@
         e41tHNbucUGnKxICiqXjHpTPJgHBZ/Nv4U1oHqGZJVwstiNe72JwI+J3PYA2MV8IMjOG2dzLfOatBg+2
         7JDQ0tEPX9cguvv8GHg5hH0mC9S6eiQweLumDhqNVQgo06dP9fN4UsIoJHRnOhVtmxZGM1NXKoJ3JmTH
         Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="PoketoolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
-        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
-        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
-        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
-        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
-        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
-        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
-        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
-        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
-        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/BizHawk.MultiClient/tools/RamWatch.Designer.cs b/BizHawk.MultiClient/tools/RamWatch.Designer.cs
index 73bd91621c..fb8656b7df 100644
--- a/BizHawk.MultiClient/tools/RamWatch.Designer.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.Designer.cs
@@ -73,6 +73,8 @@
             this.MoveDownStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.WatchCountLabel = new System.Windows.Forms.Label();
             this.MessageLabel = new System.Windows.Forms.Label();
+            this.PoketoolStripButton2 = new System.Windows.Forms.ToolStripButton();
+            this.pokeAddressToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -214,6 +216,7 @@
             this.removeWatchToolStripMenuItem,
             this.duplicateWatchToolStripMenuItem,
             this.insertSeparatorToolStripMenuItem,
+            this.pokeAddressToolStripMenuItem,
             this.toolStripSeparator3,
             this.moveUpToolStripMenuItem,
             this.moveDownToolStripMenuItem});
@@ -328,6 +331,7 @@
             this.EditWatchToolStripButton1,
             this.cutToolStripButton,
             this.DuplicateWatchToolStripButton,
+            this.PoketoolStripButton2,
             this.toolStripButton1,
             this.toolStripSeparator5,
             this.MoveUpStripButton1,
@@ -470,6 +474,25 @@
             this.MessageLabel.TabIndex = 5;
             this.MessageLabel.Text = "                                                            ";
             // 
+            // PoketoolStripButton2
+            // 
+            this.PoketoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.PoketoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
+            this.PoketoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.PoketoolStripButton2.Name = "PoketoolStripButton2";
+            this.PoketoolStripButton2.Size = new System.Drawing.Size(23, 22);
+            this.PoketoolStripButton2.Text = "toolStripButton2";
+            this.PoketoolStripButton2.ToolTipText = "Poke address";
+            this.PoketoolStripButton2.Click += new System.EventHandler(this.PoketoolStripButton2_Click);
+            // 
+            // pokeAddressToolStripMenuItem
+            // 
+            this.pokeAddressToolStripMenuItem.Name = "pokeAddressToolStripMenuItem";
+            this.pokeAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
+            this.pokeAddressToolStripMenuItem.Size = new System.Drawing.Size(202, 22);
+            this.pokeAddressToolStripMenuItem.Text = "Poke Address";
+            this.pokeAddressToolStripMenuItem.Click += new System.EventHandler(this.pokeAddressToolStripMenuItem_Click);
+            // 
             // RamWatch
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -543,5 +566,7 @@
         private System.Windows.Forms.Label MessageLabel;
         private System.Windows.Forms.ToolStripMenuItem insertSeparatorToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton toolStripButton1;
+        private System.Windows.Forms.ToolStripButton PoketoolStripButton2;
+        private System.Windows.Forms.ToolStripMenuItem pokeAddressToolStripMenuItem;
     }
 }
\ No newline at end of file
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index 24e5ec2bf1..8782a8992d 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -21,6 +21,9 @@ namespace BizHawk.MultiClient
         //Address can be changed, when that event is triggered, open the edit watch dialog
         //Import images into resource file
         //Multiselect is enabled but only one row can be highlighted by the user
+        //Make it clear that on edit/new/duplicate watch, address is hex
+        //Validate address box as legit hex number
+        //Implement PokeAddress()
         int defaultWidth;     //For saving the default size of the dialog, so the user can restore if desired
         int defaultHeight;
         List<Watch> watchList = new List<Watch>();
@@ -718,5 +721,19 @@ namespace BizHawk.MultiClient
         {
             InsertSeparator();
         }
+
+        private void PoketoolStripButton2_Click(object sender, EventArgs e)
+        {
+            PokeAddress();
+        }
+
+        private void PokeAddress()
+        {
+        }
+
+        private void pokeAddressToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            PokeAddress();
+        }
     }
 }