From 79c6ed4195eabe653ca1d4fceb9605703bb0feee Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Fri, 21 Jan 2011 04:32:32 +0000 Subject: [PATCH] Ram Watch - Duplicate Watch implemented --- BizHawk.MultiClient/RamWatch.cs | 18 +++++++++++++++--- .../RamWatchNewWatch.Designer.cs | 2 ++ BizHawk.MultiClient/RamWatchNewWatch.cs | 4 ++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/BizHawk.MultiClient/RamWatch.cs b/BizHawk.MultiClient/RamWatch.cs index abceebbf58..9b3543a90e 100644 --- a/BizHawk.MultiClient/RamWatch.cs +++ b/BizHawk.MultiClient/RamWatch.cs @@ -18,6 +18,8 @@ namespace BizHawk.MultiClient //implement separator feature //Display value differently based on signed or hex, endian, type //Currently address is 4 digit hex, but at some point it needs to be smart enough to adjust size based on the emulator core used + //Make Edit/Add/Duplicate Watch windows appear in relation to the listview box + //Make a context menu for add/remove/Dup/etc, make the context menu & edit watch windows appear in relation to where they right clicked int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired int defaultHeight; List watchList = new List(); @@ -175,12 +177,11 @@ namespace BizHawk.MultiClient ListView.SelectedIndexCollection indexes = WatchListView.SelectedIndices; RamWatchNewWatch r = new RamWatchNewWatch(); int x = indexes[0]; - r.SetToEditWatch( watchList[x] ); + r.SetToEditWatch(watchList[x], "Edit Watch"); r.ShowDialog(); if (r.userSelected == true) { - //TODO: check if edited watch is an exact duplicate and prevent? //TODO: changes have been made, flag it watchList[x] = r.watch; DisplayWatchList(); @@ -190,7 +191,6 @@ namespace BizHawk.MultiClient void RemoveWatch() { //TODO: flag that changes have been made - //TODO: why can't the user selected multiple indices even though mutliselect is set to true? ListView.SelectedIndexCollection indexes = WatchListView.SelectedIndices; foreach (int index in indexes) { @@ -201,6 +201,18 @@ namespace BizHawk.MultiClient void DuplicateWatch() { + ListView.SelectedIndexCollection indexes = WatchListView.SelectedIndices; + RamWatchNewWatch r = new RamWatchNewWatch(); + int x = indexes[0]; + r.SetToEditWatch(watchList[x], "Duplicate Watch"); + r.ShowDialog(); + + if (r.userSelected == true) + { + //TODO: changes have been made, flag it + watchList.Add(watchList[x]); + DisplayWatchList(); + } } void MoveUp() diff --git a/BizHawk.MultiClient/RamWatchNewWatch.Designer.cs b/BizHawk.MultiClient/RamWatchNewWatch.Designer.cs index a426e94d70..c3a148767d 100644 --- a/BizHawk.MultiClient/RamWatchNewWatch.Designer.cs +++ b/BizHawk.MultiClient/RamWatchNewWatch.Designer.cs @@ -241,6 +241,8 @@ this.Controls.Add(this.AddressBox); this.Controls.Add(this.label2); this.Controls.Add(this.label1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; this.Name = "RamWatchNewWatch"; this.Text = "New Watch"; this.Load += new System.EventHandler(this.RamWatchNewWatch_Load); diff --git a/BizHawk.MultiClient/RamWatchNewWatch.cs b/BizHawk.MultiClient/RamWatchNewWatch.cs index 367018f2ca..f9ba8921f2 100644 --- a/BizHawk.MultiClient/RamWatchNewWatch.cs +++ b/BizHawk.MultiClient/RamWatchNewWatch.cs @@ -20,10 +20,10 @@ namespace BizHawk.MultiClient InitializeComponent(); } - public void SetToEditWatch(Watch w) + public void SetToEditWatch(Watch w, string message) { //Sets this dialog to Edit Watch and receives default values - this.Text = "Edit Watch"; + this.Text = message; AddressBox.Text = string.Format("{0:X4}", w.address); NotesBox.Text = w.notes;