From f9256f5cd1e444f4fea53e1723890a837a0e23e8 Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Sun, 20 Mar 2011 01:10:02 +0000
Subject: [PATCH] Make default filename in Open/SaveFile dialogs on Ram Watch,
 Ram Search, and Cheats window

---
 BizHawk.MultiClient/tools/Cheats.cs    | 6 ++++++
 BizHawk.MultiClient/tools/RamSearch.cs | 9 ++++++++-
 BizHawk.MultiClient/tools/RamWatch.cs  | 7 ++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs
index 741e84b741..df4174efbc 100644
--- a/BizHawk.MultiClient/tools/Cheats.cs
+++ b/BizHawk.MultiClient/tools/Cheats.cs
@@ -334,6 +334,10 @@ namespace BizHawk.MultiClient
         private FileInfo GetSaveFileFromUser()
         {
             var sfd = new SaveFileDialog();
+            if (currentCheatFile.Length > 0)
+                sfd.FileName = Path.GetFileNameWithoutExtension(currentCheatFile);
+            else if (!(Global.Emulator is NullEmulator))
+                sfd.FileName = Global.Game.Name;
             sfd.InitialDirectory = Global.Config.LastRomPath;
             sfd.Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*";
             sfd.RestoreDirectory = true;
@@ -462,6 +466,8 @@ namespace BizHawk.MultiClient
         private FileInfo GetFileFromUser()
         {
             var ofd = new OpenFileDialog();
+            if (currentCheatFile.Length > 0)
+                ofd.FileName = Path.GetFileNameWithoutExtension(currentCheatFile);
             ofd.InitialDirectory = Global.Config.LastRomPath;
             ofd.Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*";
             ofd.RestoreDirectory = true;
diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs
index 3f677a763c..8f9cc077c9 100644
--- a/BizHawk.MultiClient/tools/RamSearch.cs
+++ b/BizHawk.MultiClient/tools/RamSearch.cs
@@ -1232,6 +1232,10 @@ namespace BizHawk.MultiClient
         private FileInfo GetSaveFileFromUser()
         {
             var sfd = new SaveFileDialog();
+            if (currentSearchFile.Length > 0)
+                sfd.FileName = Path.GetFileNameWithoutExtension(currentSearchFile);
+            else if (!(Global.Emulator is NullEmulator))
+                sfd.FileName = Global.Game.Name;
             sfd.InitialDirectory = Global.Config.LastRomPath;
             sfd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*";
             sfd.RestoreDirectory = true;
@@ -1422,10 +1426,13 @@ namespace BizHawk.MultiClient
         private FileInfo GetFileFromUser()
         {
             var ofd = new OpenFileDialog();
+            if (currentSearchFile.Length > 0)
+                ofd.FileName = Path.GetFileNameWithoutExtension(currentSearchFile);
             ofd.InitialDirectory = Global.Config.LastRomPath;
             ofd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*";
             ofd.RestoreDirectory = true;
-
+            if (currentSearchFile.Length > 0)
+                ofd.FileName = Path.GetFileNameWithoutExtension(currentSearchFile);
             Global.Sound.StopSound();
             var result = ofd.ShowDialog();
             Global.Sound.StartSound();
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index a861c5c16d..2ed1fd175d 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -17,7 +17,6 @@ namespace BizHawk.MultiClient
     public partial class RamWatch : Form
     {
         //TODO: 
-        //Make default .wch filename based on Rom, ditto for Ram Search & Cheat Search
         //address num digits based on domain size
         //Restore window size should restore column order as well
         //When receiving a watch from a different domain, should something be done?
@@ -579,6 +578,8 @@ namespace BizHawk.MultiClient
         private FileInfo GetFileFromUser()
         {
             var ofd = new OpenFileDialog();
+            if (currentWatchFile.Length > 0)
+                ofd.FileName = Path.GetFileNameWithoutExtension(currentWatchFile);
             ofd.InitialDirectory = Global.Config.LastRomPath;
             ofd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*";
             ofd.RestoreDirectory = true;
@@ -624,6 +625,10 @@ namespace BizHawk.MultiClient
         private FileInfo GetSaveFileFromUser()
         {
             var sfd = new SaveFileDialog();
+            if (currentWatchFile.Length > 0)
+                sfd.FileName = Path.GetFileNameWithoutExtension(currentWatchFile);
+            else if (!(Global.Emulator is NullEmulator))
+                sfd.FileName = Global.Game.Name;
             sfd.InitialDirectory = Global.Config.LastRomPath;
             sfd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*";
             sfd.RestoreDirectory = true;