From d8772ebf9da684863c80ce9ce1630f158e14d3b5 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Fri, 18 Feb 2011 07:02:33 +0000 Subject: [PATCH] Ram Watch - Drag & Drop .wch files --- BizHawk.MultiClient/tools/RamPoke.cs | 1 + BizHawk.MultiClient/tools/RamWatch.Designer.cs | 3 +++ BizHawk.MultiClient/tools/RamWatch.cs | 18 +++++++++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/BizHawk.MultiClient/tools/RamPoke.cs b/BizHawk.MultiClient/tools/RamPoke.cs index ba953c355e..4eb1439a46 100644 --- a/BizHawk.MultiClient/tools/RamPoke.cs +++ b/BizHawk.MultiClient/tools/RamPoke.cs @@ -15,6 +15,7 @@ namespace BizHawk.MultiClient //TODO: //If signed/unsigned/hex radios selected, auto-change the value box //Checked signed/u/h value on RamPoke_Load and set value appopriately + //Validate address (hex) and value (based on s/u/h setting) public Watch watch = new Watch(); public Point location = new Point(); diff --git a/BizHawk.MultiClient/tools/RamWatch.Designer.cs b/BizHawk.MultiClient/tools/RamWatch.Designer.cs index bc3029e145..679c2f4674 100644 --- a/BizHawk.MultiClient/tools/RamWatch.Designer.cs +++ b/BizHawk.MultiClient/tools/RamWatch.Designer.cs @@ -578,6 +578,7 @@ // // RamWatch // + this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(364, 424); @@ -592,6 +593,8 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.Text = "Ram Watch"; this.Load += new System.EventHandler(this.RamWatch_Load); + this.DragDrop += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragDrop); + this.DragEnter += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragEnter); this.Resize += new System.EventHandler(this.RamWatch_Resize); this.LocationChanged += new System.EventHandler(this.RamWatch_LocationChanged); this.menuStrip1.ResumeLayout(false); diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs index 627a84eda6..605575b86d 100644 --- a/BizHawk.MultiClient/tools/RamWatch.cs +++ b/BizHawk.MultiClient/tools/RamWatch.cs @@ -17,10 +17,11 @@ namespace BizHawk.MultiClient public partial class RamWatch : Form { //TODO: - //TODO: Call AskSave in main client X function + //Call AskSave in main client X function //Multiselect is enabled but only one row can be highlighted by the user //DWORD display //On Movie UP/Down set highlighted items to be what the user had selected (in their new position) + //DisplayWatches needs to do value display properly like updatevalues, or just run update values int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired int defaultHeight; @@ -852,5 +853,20 @@ namespace BizHawk.MultiClient EditWatch(); } } + + private void RamWatch_DragDrop(object sender, DragEventArgs e) + { + string[] filePaths = (string[])e.Data.GetData(DataFormats.FileDrop); + if (filePaths[0].Contains(".wch")) //TODO: a less lazy way to check file extension? + { + LoadWatchFile(filePaths[0], false); + DisplayWatchList(); + } + } + + private void RamWatch_DragEnter(object sender, DragEventArgs e) + { + e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;string[] filePaths = (string[]) e.Data.GetData(DataFormats.FileDrop); + } } }