ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cheats - better icon, fix Save function to use default filename and save automatically, refactored into its own Save() function

This commit is contained in:
andres.delikat 2011-08-06 22:25:37 +00:00
parent 95c8e709b6
commit df5d27e0f3
15 changed files with 2912 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -648,6 +648,8 @@
<None Include="images\corphawk.jpg" />
<None Include="images\Help.png" />
<None Include="images\CorpHawkSmall.png" />
<None Include="images\Freeze.png" />
<None Include="images\Unfreeze.png" />
<Content Include="output\gamedb.txt" />
<Content Include="output\gamedb_neshomebrew.txt" />
<None Include="images\Refresh.bmp" />

26
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

@ -1447,20 +1447,20 @@
//
this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox;
this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem";
this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.toolBoxToolStripMenuItem.Text = "&Tool Box";
this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(140, 6);
this.toolStripSeparator12.Size = new System.Drawing.Size(149, 6);
//
// rAMWatchToolStripMenuItem
//
this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem";
this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.rAMWatchToolStripMenuItem.Text = "RAM &Watch";
this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click);
//
@ -1468,7 +1468,7 @@
//
this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search;
this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem";
this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.rAMSearchToolStripMenuItem.Text = "RAM &Search";
this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click);
//
@ -1476,7 +1476,7 @@
//
this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem";
this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.rAMPokeToolStripMenuItem.Text = "RAM &Poke";
this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click);
//
@ -1484,7 +1484,7 @@
//
this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem";
this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.hexEditorToolStripMenuItem.Text = "&Hex Editor";
this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click);
//
@ -1492,28 +1492,28 @@
//
this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem";
this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.tAStudioToolStripMenuItem.Text = "&TAStudio";
this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(149, 6);
//
// luaConsoleToolStripMenuItem
//
this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua;
this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem";
this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.luaConsoleToolStripMenuItem.Text = "Lua Console";
this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click);
//
// cheatsToolStripMenuItem
//
this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat;
this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem";
this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.cheatsToolStripMenuItem.Text = "Cheats";
this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click);
//
@ -1631,7 +1631,7 @@
//
this.helpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Help;
this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1";
this.helpToolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
this.helpToolStripMenuItem1.Size = new System.Drawing.Size(151, 22);
this.helpToolStripMenuItem1.Text = "&Online Help...";
this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click);
//
@ -1639,7 +1639,7 @@
//
this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall;
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
this.aboutToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.aboutToolStripMenuItem.Size = new System.Drawing.Size(151, 22);
this.aboutToolStripMenuItem.Text = "&About";
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
//

14
BizHawk.MultiClient/Properties/Resources.Designer.cs generated
View File

@ -228,6 +228,13 @@ namespace BizHawk.MultiClient.Properties {
}
}
internal static System.Drawing.Bitmap Freeze {
get {
object obj = ResourceManager.GetObject("Freeze", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap Fullscreen {
get {
object obj = ResourceManager.GetObject("Fullscreen", resourceCulture);
@ -591,6 +598,13 @@ namespace BizHawk.MultiClient.Properties {
}
}
internal static System.Drawing.Bitmap Unfreeze {
get {
object obj = ResourceManager.GetObject("Unfreeze", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap WarningHS {
get {
object obj = ResourceManager.GetObject("WarningHS", resourceCulture);

6
BizHawk.MultiClient/Properties/Resources.resx
View File

@ -786,4 +786,10 @@
<data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Freeze" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\Freeze.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Unfreeze" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\Unfreeze.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
BizHawk.MultiClient/images/Freeze.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 159 KiB

BIN
BizHawk.MultiClient/images/Freeze.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
BizHawk.MultiClient/images/Unfreeze.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

2
BizHawk.MultiClient/tools/Cheats.Designer.cs generated
View File

@ -235,7 +235,7 @@
//
// addCheatToolStripMenuItem
//
this.addCheatToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat;
this.addCheatToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.addCheatToolStripMenuItem.Name = "addCheatToolStripMenuItem";
this.addCheatToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
this.addCheatToolStripMenuItem.Text = "&Add Cheat";

19
BizHawk.MultiClient/tools/Cheats.cs
View File

@ -428,22 +428,21 @@ namespace BizHawk.MultiClient
private void saveToolStripButton_Click(object sender, EventArgs e)
{
if (Global.CheatList.changes)
Save();
}
private void Save()
{
if (string.Compare(Global.CheatList.currentCheatFile, "") == 0)
Global.CheatList.currentCheatFile = Global.CheatList.MakeDefaultFilename();
Global.CheatList.SaveCheatFile(Global.CheatList.currentCheatFile);
}
else
{
SaveAs();
}
MessageLabel.Text = Path.GetFileName(Global.CheatList.currentCheatFile) + " saved.";
}
private void saveToolStripMenuItem_Click(object sender, EventArgs e)
{
if (string.Compare(Global.CheatList.currentCheatFile, "") == 0) return;
if (Global.CheatList.changes)
Global.CheatList.SaveCheatFile(Global.CheatList.currentCheatFile);
Save();
}
private void saveAsToolStripMenuItem_Click(object sender, EventArgs e)

2733
BizHawk.MultiClient/tools/Cheats.resx
View File

File diff suppressed because it is too large Load Diff

4
BizHawk.MultiClient/tools/HexEditor.Designer.cs generated
View File

@ -187,7 +187,7 @@
//
// freezeAddressToolStripMenuItem
//
this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat;
this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.freezeAddressToolStripMenuItem.Name = "freezeAddressToolStripMenuItem";
this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(204, 22);
this.freezeAddressToolStripMenuItem.Text = "&Freeze Address";
@ -259,7 +259,7 @@
//
// freezeToolStripMenuItem
//
this.freezeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat;
this.freezeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.freezeToolStripMenuItem.Name = "freezeToolStripMenuItem";
this.freezeToolStripMenuItem.Size = new System.Drawing.Size(175, 22);
this.freezeToolStripMenuItem.Text = "&Freeze";

4
BizHawk.MultiClient/tools/RamSearch.Designer.cs generated
View File

@ -243,7 +243,7 @@
// FreezeAddressToolStrip
//
this.FreezeAddressToolStrip.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.FreezeAddressToolStrip.Image = global::BizHawk.MultiClient.Properties.Resources.cheat;
this.FreezeAddressToolStrip.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.FreezeAddressToolStrip.ImageTransparentColor = System.Drawing.Color.Magenta;
this.FreezeAddressToolStrip.Name = "FreezeAddressToolStrip";
this.FreezeAddressToolStrip.Size = new System.Drawing.Size(23, 22);
@ -373,7 +373,7 @@
//
// freezeAddressToolStripMenuItem1
//
this.freezeAddressToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.cheat;
this.freezeAddressToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.freezeAddressToolStripMenuItem1.Name = "freezeAddressToolStripMenuItem1";
this.freezeAddressToolStripMenuItem1.Size = new System.Drawing.Size(175, 22);
this.freezeAddressToolStripMenuItem1.Text = "Freeze Address";

6
BizHawk.MultiClient/tools/RamSearch.resx
View File

@ -163,6 +163,9 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 17</value>
</metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>358, 17</value>
</metadata>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -194,9 +197,6 @@
s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
</value>
</data>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>358, 17</value>
</metadata>
<data name="DataSizetoolStripSplitButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

6
BizHawk.MultiClient/tools/RamWatch.Designer.cs generated
View File

@ -310,7 +310,7 @@
//
// freezeAddressToolStripMenuItem
//
this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat;
this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.freezeAddressToolStripMenuItem.Name = "freezeAddressToolStripMenuItem";
this.freezeAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
@ -723,11 +723,11 @@
// FreezetoolStripButton2
//
this.FreezetoolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.FreezetoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.cheat;
this.FreezetoolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.FreezetoolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.FreezetoolStripButton2.Name = "FreezetoolStripButton2";
this.FreezetoolStripButton2.Size = new System.Drawing.Size(23, 22);
this.FreezetoolStripButton2.Text = "Freeze";
this.FreezetoolStripButton2.Text = "Freeze Address";
this.FreezetoolStripButton2.Click += new System.EventHandler(this.FreezetoolStripButton2_Click);
//
// toolStripButton1

2
BizHawk.MultiClient/tools/ToolBox.Designer.cs generated
View File

@ -68,7 +68,7 @@
//
// toolStripButton1
//
this.toolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.cheat;
this.toolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(61, 20);