diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index a3c76257c2..21a6678da9 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -151,6 +151,13 @@
RecordMovie.cs
+
+ Form
+
+
+ InputPrompt.cs
+
+
Form
@@ -211,6 +218,10 @@
RecordMovie.cs
Designer
+
+ InputPrompt.cs
+ Designer
+
RamSearch.cs
Designer
diff --git a/BizHawk.MultiClient/tools/InputPrompt.Designer.cs b/BizHawk.MultiClient/tools/InputPrompt.Designer.cs
new file mode 100644
index 0000000000..fd5878ef83
--- /dev/null
+++ b/BizHawk.MultiClient/tools/InputPrompt.Designer.cs
@@ -0,0 +1,102 @@
+namespace BizHawk.MultiClient
+{
+ partial class InputPrompt
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.PromptLabel = new System.Windows.Forms.Label();
+ this.PromptBox = new System.Windows.Forms.TextBox();
+ this.OK = new System.Windows.Forms.Button();
+ this.Cancel = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // PromptLabel
+ //
+ this.PromptLabel.AutoSize = true;
+ this.PromptLabel.Location = new System.Drawing.Point(33, 9);
+ this.PromptLabel.Name = "PromptLabel";
+ this.PromptLabel.Size = new System.Drawing.Size(73, 13);
+ this.PromptLabel.TabIndex = 0;
+ this.PromptLabel.Text = "Enter a value:";
+ //
+ // PromptBox
+ //
+ this.PromptBox.Location = new System.Drawing.Point(36, 25);
+ this.PromptBox.Name = "PromptBox";
+ this.PromptBox.Size = new System.Drawing.Size(164, 20);
+ this.PromptBox.TabIndex = 1;
+ //
+ // OK
+ //
+ this.OK.Location = new System.Drawing.Point(36, 67);
+ this.OK.Name = "OK";
+ this.OK.Size = new System.Drawing.Size(75, 23);
+ this.OK.TabIndex = 2;
+ this.OK.Text = "&Ok";
+ this.OK.UseVisualStyleBackColor = true;
+ this.OK.Click += new System.EventHandler(this.OK_Click);
+ //
+ // Cancel
+ //
+ this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.Cancel.Location = new System.Drawing.Point(125, 67);
+ this.Cancel.Name = "Cancel";
+ this.Cancel.Size = new System.Drawing.Size(75, 23);
+ this.Cancel.TabIndex = 3;
+ this.Cancel.Text = "&Cancel";
+ this.Cancel.UseVisualStyleBackColor = true;
+ //
+ // InputPrompt
+ //
+ this.AcceptButton = this.OK;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.Cancel;
+ this.ClientSize = new System.Drawing.Size(233, 106);
+ this.Controls.Add(this.Cancel);
+ this.Controls.Add(this.OK);
+ this.Controls.Add(this.PromptBox);
+ this.Controls.Add(this.PromptLabel);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "InputPrompt";
+ this.ShowIcon = false;
+ this.Text = "InputPrompt";
+ this.Load += new System.EventHandler(this.InputPrompt_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label PromptLabel;
+ private System.Windows.Forms.TextBox PromptBox;
+ private System.Windows.Forms.Button OK;
+ private System.Windows.Forms.Button Cancel;
+ }
+}
\ No newline at end of file
diff --git a/BizHawk.MultiClient/tools/InputPrompt.cs b/BizHawk.MultiClient/tools/InputPrompt.cs
new file mode 100644
index 0000000000..36762fab4c
--- /dev/null
+++ b/BizHawk.MultiClient/tools/InputPrompt.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace BizHawk.MultiClient
+{
+ ///
+ /// A simple form that prompts the user for a single line of input
+ ///
+ public partial class InputPrompt : Form
+ {
+ public bool UserOK = false; //Will be true if the user selects Ok
+ public string UserText = ""; //What the user selected
+
+ public InputPrompt()
+ {
+ InitializeComponent();
+ }
+
+ private void InputPrompt_Load(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ private void OK_Click(object sender, EventArgs e)
+ {
+ UserOK = true;
+ this.Close();
+ }
+ }
+}
diff --git a/BizHawk.MultiClient/tools/InputPrompt.resx b/BizHawk.MultiClient/tools/InputPrompt.resx
new file mode 100644
index 0000000000..ff31a6db56
--- /dev/null
+++ b/BizHawk.MultiClient/tools/InputPrompt.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/BizHawk.MultiClient/tools/Poke.cs b/BizHawk.MultiClient/tools/Poke.cs
new file mode 100644
index 0000000000..7bb3ca97d5
--- /dev/null
+++ b/BizHawk.MultiClient/tools/Poke.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BizHawk.MultiClient
+{
+ ///
+ /// This class prompts the user for an address & value and writes to memory
+ /// If supplied a Watch object it will use it to generate default values
+ ///
+ class Poke
+ {
+ Watch w = new Watch();
+
+ public bool PokeAddress(Watch watch)
+ {
+ w = watch;
+ return PokeWatch();
+ }
+
+ public bool PokeAddress()
+ {
+ return PokeWatch();
+ }
+
+ private bool PokeWatch()
+ {
+ InputPrompt i = new InputPrompt();
+ i.Text = "Poke address";
+ i.ShowDialog();
+ //Prompt user
+ //Attempt to poke
+ //If use cancels or some failure, return false, else turn true
+ return true;
+ }
+ }
+}
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index 69c8f20e09..2d05691360 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -290,7 +290,7 @@ namespace BizHawk.MultiClient
if (r.userSelected == true)
{
Changes();
- watchList.Add(watchList[x]);
+ watchList.Add(watchList[x]); //TODO: Fail, add the userselected watchlist
DisplayWatchList();
}
}
@@ -732,6 +732,9 @@ namespace BizHawk.MultiClient
private void PokeAddress()
{
+ ListView.SelectedIndexCollection indexes = WatchListView.SelectedIndices;
+ Poke p = new Poke();
+ p.PokeAddress(watchList[indexes[0]]);
}
private void pokeAddressToolStripMenuItem_Click(object sender, EventArgs e)