diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index c75da2b309..075cc73465 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -538,6 +538,18 @@ + + + + + + + + + + + + diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 8f02571bcf..48d17b7d9e 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -198,10 +198,10 @@ this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.DumpError = new System.Windows.Forms.ToolStripDropDownButton(); this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.PlayRecordStatus = new System.Windows.Forms.ToolStripDropDownButton(); this.PauseStrip = new System.Windows.Forms.ToolStripDropDownButton(); - this.DumpError = new System.Windows.Forms.ToolStripDropDownButton(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.openRomToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.loadLastROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -264,6 +264,7 @@ // // openROMToolStripMenuItem // + this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; this.openROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22); this.openROMToolStripMenuItem.Text = "Open ROM"; @@ -734,6 +735,7 @@ // // stopMovieToolStripMenuItem // + this.stopMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem"; this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(222, 22); this.stopMovieToolStripMenuItem.Text = "Stop Movie"; @@ -741,6 +743,7 @@ // // playFromBeginningToolStripMenuItem // + this.playFromBeginningToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem"; this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(222, 22); this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning"; @@ -818,33 +821,33 @@ // pauseToolStripMenuItem // this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; - this.pauseToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.pauseToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.pauseToolStripMenuItem.Text = "&Pause"; this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6); // // powerToolStripMenuItem // this.powerToolStripMenuItem.Name = "powerToolStripMenuItem"; - this.powerToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.powerToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.powerToolStripMenuItem.Text = "Power Cycle"; this.powerToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); // // resetToolStripMenuItem // this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.resetToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.resetToolStripMenuItem.Text = "&Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(141, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(149, 6); // // sega8bitToolStripMenuItem // @@ -853,7 +856,7 @@ this.overclockWhenKnownSafeToolStripMenuItem, this.forceStereoSeparationToolStripMenuItem}); this.sega8bitToolStripMenuItem.Name = "sega8bitToolStripMenuItem"; - this.sega8bitToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.sega8bitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.sega8bitToolStripMenuItem.Text = "Sega 8-bit"; // // enableFMChipToolStripMenuItem @@ -1030,40 +1033,40 @@ // controllersToolStripMenuItem // this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; - this.controllersToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.controllersToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.controllersToolStripMenuItem.Text = "&Controllers..."; this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); // // hotkeysToolStripMenuItem // this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem"; - this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.hotkeysToolStripMenuItem.Text = "&Hotkeys..."; this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); // // messagesToolStripMenuItem // this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem"; - this.messagesToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.messagesToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.messagesToolStripMenuItem.Text = "&Messages..."; this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click); // // pathsToolStripMenuItem // this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem"; - this.pathsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.pathsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.pathsToolStripMenuItem.Text = "Paths..."; this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(146, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6); // // soundToolStripMenuItem // this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; - this.soundToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.soundToolStripMenuItem.Text = "&Sound"; this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); // @@ -1080,7 +1083,7 @@ this.singleInstanceModeToolStripMenuItem, this.enableContextMenuToolStripMenuItem}); this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; - this.gUIToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.gUIToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.gUIToolStripMenuItem.Text = "GUI"; this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); // @@ -1171,7 +1174,7 @@ this.miSpeed150, this.miSpeed200}); this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem"; - this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.frameSkipToolStripMenuItem.Text = "Speed/Skip"; this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened); // @@ -1314,19 +1317,21 @@ // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(146, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(149, 6); // // saveConfigToolStripMenuItem // + this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveConfig; this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; - this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveConfigToolStripMenuItem.Text = "Save Config"; this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); // // loadConfigToolStripMenuItem // + this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; - this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.loadConfigToolStripMenuItem.Text = "Load Config"; // // toolsToolStripMenuItem @@ -1349,67 +1354,75 @@ // // toolBoxToolStripMenuItem // + 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); // // rAMSearchToolStripMenuItem // + 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); // // rAMPokeToolStripMenuItem // + 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); // // hexEditorToolStripMenuItem // + 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); // // tAStudioToolStripMenuItem // + 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.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); // @@ -1546,6 +1559,16 @@ this.statusStrip1.TabIndex = 1; this.statusStrip1.Text = "statusStrip1"; // + // DumpError + // + this.DumpError.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.None; + this.DumpError.Image = global::BizHawk.MultiClient.Properties.Resources.WarningHS; + this.DumpError.ImageTransparentColor = System.Drawing.Color.Magenta; + this.DumpError.Name = "DumpError"; + this.DumpError.ShowDropDownArrow = false; + this.DumpError.Size = new System.Drawing.Size(4, 20); + this.DumpError.Text = "Bad ROM Dump in use"; + // // EmuStatus // this.EmuStatus.Name = "EmuStatus"; @@ -1573,16 +1596,6 @@ this.PauseStrip.Text = "toolStripDropDownButton1"; this.PauseStrip.ToolTipText = "Emulator is paused"; // - // DumpError - // - this.DumpError.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.None; - this.DumpError.Image = global::BizHawk.MultiClient.Properties.Resources.WarningHS; - this.DumpError.ImageTransparentColor = System.Drawing.Color.Magenta; - this.DumpError.Name = "DumpError"; - this.DumpError.ShowDropDownArrow = false; - this.DumpError.Size = new System.Drawing.Size(4, 20); - this.DumpError.Text = "Bad ROM Dump in use"; - // // contextMenuStrip1 // this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1607,6 +1620,7 @@ // // openRomToolStripMenuItem1 // + this.openRomToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openRomToolStripMenuItem1.Name = "openRomToolStripMenuItem1"; this.openRomToolStripMenuItem1.Size = new System.Drawing.Size(178, 22); this.openRomToolStripMenuItem1.Text = "Open Rom"; @@ -1640,6 +1654,7 @@ // // stopMovieToolStripMenuItem1 // + this.stopMovieToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopMovieToolStripMenuItem1.Name = "stopMovieToolStripMenuItem1"; this.stopMovieToolStripMenuItem1.Size = new System.Drawing.Size(178, 22); this.stopMovieToolStripMenuItem1.Text = "Stop Movie"; diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index b0bdd78dfe..61ff4818d3 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -130,6 +130,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap CutHS { + get { + object obj = ResourceManager.GetObject("CutHS", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Debugger { get { object obj = ResourceManager.GetObject("Debugger", resourceCulture); @@ -137,6 +144,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap Duplicate { + get { + object obj = ResourceManager.GetObject("Duplicate", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap FastForward { get { object obj = ResourceManager.GetObject("FastForward", resourceCulture); @@ -186,6 +200,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap LoadConfig { + get { + object obj = ResourceManager.GetObject("LoadConfig", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Lua { get { object obj = ResourceManager.GetObject("Lua", resourceCulture); @@ -207,12 +228,26 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap NewFile { + get { + object obj = ResourceManager.GetObject("NewFile", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.IO.UnmanagedMemoryStream nothawk { get { return ResourceManager.GetStream("nothawk", resourceCulture); } } + internal static System.Drawing.Bitmap OpenFile { + get { + object obj = ResourceManager.GetObject("OpenFile", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Pause { get { object obj = ResourceManager.GetObject("Pause", resourceCulture); @@ -241,6 +276,20 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap Previous { + get { + object obj = ResourceManager.GetObject("Previous", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap PrintPreviewHS { + get { + object obj = ResourceManager.GetObject("PrintPreviewHS", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap ReadOnly { get { object obj = ResourceManager.GetObject("ReadOnly", resourceCulture); @@ -248,6 +297,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap redo { + get { + object obj = ResourceManager.GetObject("redo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Refresh { get { object obj = ResourceManager.GetObject("Refresh", resourceCulture); @@ -255,6 +311,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap Refresh1 { + get { + object obj = ResourceManager.GetObject("Refresh1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap restart { get { object obj = ResourceManager.GetObject("restart", resourceCulture); @@ -262,6 +325,20 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap SaveAs { + get { + object obj = ResourceManager.GetObject("SaveAs", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap SaveConfig { + get { + object obj = ResourceManager.GetObject("SaveConfig", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap search { get { object obj = ResourceManager.GetObject("search", resourceCulture); @@ -283,6 +360,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap TAStudio { + get { + object obj = ResourceManager.GetObject("TAStudio", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap textdoc { get { object obj = ResourceManager.GetObject("textdoc", resourceCulture); diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx index 06047644bd..29de10afd5 100644 --- a/BizHawk.MultiClient/Properties/Resources.resx +++ b/BizHawk.MultiClient/Properties/Resources.resx @@ -675,4 +675,40 @@ ..\images\WarningHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\CutHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\Duplicate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\NewFile.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\OpenFile.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\PrintPreviewHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\redo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\Refresh.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\SaveAs.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\TAStudio.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\LoadConfig.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\Previous.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\SaveConfig.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.MultiClient/images/CutHS.png b/BizHawk.MultiClient/images/CutHS.png new file mode 100644 index 0000000000..51449ba37c Binary files /dev/null and b/BizHawk.MultiClient/images/CutHS.png differ diff --git a/BizHawk.MultiClient/images/Duplicate.png b/BizHawk.MultiClient/images/Duplicate.png new file mode 100644 index 0000000000..cb3d8717a1 Binary files /dev/null and b/BizHawk.MultiClient/images/Duplicate.png differ diff --git a/BizHawk.MultiClient/images/LoadConfig.png b/BizHawk.MultiClient/images/LoadConfig.png new file mode 100644 index 0000000000..8048cc903c Binary files /dev/null and b/BizHawk.MultiClient/images/LoadConfig.png differ diff --git a/BizHawk.MultiClient/images/NewFile.png b/BizHawk.MultiClient/images/NewFile.png new file mode 100644 index 0000000000..4c5c2c3453 Binary files /dev/null and b/BizHawk.MultiClient/images/NewFile.png differ diff --git a/BizHawk.MultiClient/images/OpenFile.png b/BizHawk.MultiClient/images/OpenFile.png new file mode 100644 index 0000000000..0bc670e2c0 Binary files /dev/null and b/BizHawk.MultiClient/images/OpenFile.png differ diff --git a/BizHawk.MultiClient/images/Previous.png b/BizHawk.MultiClient/images/Previous.png new file mode 100644 index 0000000000..1789227599 Binary files /dev/null and b/BizHawk.MultiClient/images/Previous.png differ diff --git a/BizHawk.MultiClient/images/PrintPreviewHS.png b/BizHawk.MultiClient/images/PrintPreviewHS.png new file mode 100644 index 0000000000..44d3fd6ca8 Binary files /dev/null and b/BizHawk.MultiClient/images/PrintPreviewHS.png differ diff --git a/BizHawk.MultiClient/images/Refresh.png b/BizHawk.MultiClient/images/Refresh.png new file mode 100644 index 0000000000..5d9a1a7766 Binary files /dev/null and b/BizHawk.MultiClient/images/Refresh.png differ diff --git a/BizHawk.MultiClient/images/SaveAs.png b/BizHawk.MultiClient/images/SaveAs.png new file mode 100644 index 0000000000..5ca4d10623 Binary files /dev/null and b/BizHawk.MultiClient/images/SaveAs.png differ diff --git a/BizHawk.MultiClient/images/SaveConfig.png b/BizHawk.MultiClient/images/SaveConfig.png new file mode 100644 index 0000000000..7bde10a6d2 Binary files /dev/null and b/BizHawk.MultiClient/images/SaveConfig.png differ diff --git a/BizHawk.MultiClient/images/TAStudio.png b/BizHawk.MultiClient/images/TAStudio.png new file mode 100644 index 0000000000..65cd18bbe6 Binary files /dev/null and b/BizHawk.MultiClient/images/TAStudio.png differ diff --git a/BizHawk.MultiClient/images/redo.png b/BizHawk.MultiClient/images/redo.png new file mode 100644 index 0000000000..90dd179418 Binary files /dev/null and b/BizHawk.MultiClient/images/redo.png differ diff --git a/BizHawk.MultiClient/tools/Cheats.Designer.cs b/BizHawk.MultiClient/tools/Cheats.Designer.cs index 7942a78889..f32b3ed115 100644 --- a/BizHawk.MultiClient/tools/Cheats.Designer.cs +++ b/BizHawk.MultiClient/tools/Cheats.Designer.cs @@ -28,96 +28,96 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Cheats)); - this.CheatsMenu = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.appendFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.cheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.addCheatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.removeCheatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.duplicateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.insertSeparatorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.disableAllCheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadCheatFileByGameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveCheatsOnCloseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CheatsOnOffLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.autoloadDialogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.newToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.cutToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.copyToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonSeparator = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButtonMoveUp = new System.Windows.Forms.ToolStripButton(); - this.toolStripButtonMoveDown = new System.Windows.Forms.ToolStripButton(); - this.MessageLabel = new System.Windows.Forms.Label(); - this.AddCheatGroup = new System.Windows.Forms.GroupBox(); - this.EditButton = new System.Windows.Forms.Button(); - this.label6 = new System.Windows.Forms.Label(); - this.DomainComboBox = new System.Windows.Forms.ComboBox(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.AddCheatButton = new System.Windows.Forms.Button(); - this.ValueBox = new System.Windows.Forms.TextBox(); - this.AddressBox = new System.Windows.Forms.TextBox(); - this.NameBox = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.NumCheatsLabel = new System.Windows.Forms.Label(); - this.CheatListView = new BizHawk.VirtualListView(); - this.CheatName = new System.Windows.Forms.ColumnHeader(); - this.Address = new System.Windows.Forms.ColumnHeader(); - this.Value = new System.Windows.Forms.ColumnHeader(); - this.Domain = new System.Windows.Forms.ColumnHeader(); - this.On = new System.Windows.Forms.ColumnHeader(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.toggleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.removeSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.disableAllCheatsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.CheatsMenu.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.AddCheatGroup.SuspendLayout(); - this.contextMenuStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // CheatsMenu - // - this.CheatsMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Cheats)); + this.CheatsMenu = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.appendFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.cheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.addCheatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.removeCheatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.duplicateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.insertSeparatorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.disableAllCheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.LoadCheatFileByGameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveCheatsOnCloseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CheatsOnOffLoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autoloadDialogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.newToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.cutToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.copyToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonSeparator = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButtonMoveUp = new System.Windows.Forms.ToolStripButton(); + this.toolStripButtonMoveDown = new System.Windows.Forms.ToolStripButton(); + this.MessageLabel = new System.Windows.Forms.Label(); + this.AddCheatGroup = new System.Windows.Forms.GroupBox(); + this.EditButton = new System.Windows.Forms.Button(); + this.label6 = new System.Windows.Forms.Label(); + this.DomainComboBox = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.AddCheatButton = new System.Windows.Forms.Button(); + this.ValueBox = new System.Windows.Forms.TextBox(); + this.AddressBox = new System.Windows.Forms.TextBox(); + this.NameBox = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.NumCheatsLabel = new System.Windows.Forms.Label(); + this.CheatListView = new BizHawk.VirtualListView(); + this.CheatName = new System.Windows.Forms.ColumnHeader(); + this.Address = new System.Windows.Forms.ColumnHeader(); + this.Value = new System.Windows.Forms.ColumnHeader(); + this.Domain = new System.Windows.Forms.ColumnHeader(); + this.On = new System.Windows.Forms.ColumnHeader(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toggleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.removeSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.disableAllCheatsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.CheatsMenu.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.AddCheatGroup.SuspendLayout(); + this.contextMenuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // CheatsMenu + // + this.CheatsMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.cheatsToolStripMenuItem, this.optionsToolStripMenuItem}); - this.CheatsMenu.Location = new System.Drawing.Point(0, 0); - this.CheatsMenu.Name = "CheatsMenu"; - this.CheatsMenu.Size = new System.Drawing.Size(509, 24); - this.CheatsMenu.TabIndex = 1; - this.CheatsMenu.Text = "menuStrip1"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.CheatsMenu.Location = new System.Drawing.Point(0, 0); + this.CheatsMenu.Name = "CheatsMenu"; + this.CheatsMenu.Size = new System.Drawing.Size(509, 24); + this.CheatsMenu.TabIndex = 1; + this.CheatsMenu.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolStripMenuItem, this.openToolStripMenuItem, this.saveToolStripMenuItem, @@ -126,95 +126,98 @@ this.recentToolStripMenuItem, this.toolStripSeparator1, this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); - this.fileToolStripMenuItem.Text = "&File"; - this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); - // - // newToolStripMenuItem - // - this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.newToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.newToolStripMenuItem.Text = "&New"; - this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); - // - // openToolStripMenuItem - // - this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.openToolStripMenuItem.Text = "&Open..."; - this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.saveToolStripMenuItem.Text = "&Save"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // saveAsToolStripMenuItem - // - this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.S))); - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.saveAsToolStripMenuItem.Text = "Save &As..."; - this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); - // - // appendFileToolStripMenuItem - // - this.appendFileToolStripMenuItem.Name = "appendFileToolStripMenuItem"; - this.appendFileToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.appendFileToolStripMenuItem.Text = "Append File"; - this.appendFileToolStripMenuItem.Click += new System.EventHandler(this.appendFileToolStripMenuItem_Click); - // - // recentToolStripMenuItem - // - this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Text = "&File"; + this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); + // + // newToolStripMenuItem + // + this.newToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile; + this.newToolStripMenuItem.Name = "newToolStripMenuItem"; + this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); + this.newToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.newToolStripMenuItem.Text = "&New"; + this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); + // + // openToolStripMenuItem + // + this.openToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.openToolStripMenuItem.Name = "openToolStripMenuItem"; + this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.openToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.openToolStripMenuItem.Text = "&Open..."; + this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); + // + // saveToolStripMenuItem + // + this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.saveToolStripMenuItem.Text = "&Save"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + // + // saveAsToolStripMenuItem + // + this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; + this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.S))); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.saveAsToolStripMenuItem.Text = "Save &As..."; + this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); + // + // appendFileToolStripMenuItem + // + this.appendFileToolStripMenuItem.Name = "appendFileToolStripMenuItem"; + this.appendFileToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.appendFileToolStripMenuItem.Text = "Append File"; + this.appendFileToolStripMenuItem.Click += new System.EventHandler(this.appendFileToolStripMenuItem_Click); + // + // recentToolStripMenuItem + // + this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.noneToolStripMenuItem, this.toolStripSeparator4, this.clearToolStripMenuItem}); - this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; - this.recentToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.recentToolStripMenuItem.Text = "Recent"; - this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); - // - // noneToolStripMenuItem - // - this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(110, 22); - this.noneToolStripMenuItem.Text = "None"; - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(107, 6); - // - // clearToolStripMenuItem - // - this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(110, 22); - this.clearToolStripMenuItem.Text = "Clear"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(201, 6); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.exitToolStripMenuItem.Text = "E&xit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // cheatsToolStripMenuItem - // - this.cheatsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; + this.recentToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.recentToolStripMenuItem.Text = "Recent"; + this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); + // + // noneToolStripMenuItem + // + this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; + this.noneToolStripMenuItem.Size = new System.Drawing.Size(110, 22); + this.noneToolStripMenuItem.Text = "None"; + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(107, 6); + // + // clearToolStripMenuItem + // + this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; + this.clearToolStripMenuItem.Size = new System.Drawing.Size(110, 22); + this.clearToolStripMenuItem.Text = "Clear"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(201, 6); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.exitToolStripMenuItem.Text = "E&xit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // cheatsToolStripMenuItem + // + this.cheatsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.addCheatToolStripMenuItem, this.removeCheatToolStripMenuItem, this.duplicateToolStripMenuItem, @@ -224,78 +227,85 @@ this.moveDownToolStripMenuItem, this.toolStripSeparator6, this.disableAllCheatsToolStripMenuItem}); - this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(53, 20); - this.cheatsToolStripMenuItem.Text = "&Cheats"; - this.cheatsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.cheatsToolStripMenuItem_DropDownOpened); - // - // addCheatToolStripMenuItem - // - this.addCheatToolStripMenuItem.Name = "addCheatToolStripMenuItem"; - this.addCheatToolStripMenuItem.Size = new System.Drawing.Size(201, 22); - this.addCheatToolStripMenuItem.Text = "&Add Cheat"; - this.addCheatToolStripMenuItem.Click += new System.EventHandler(this.addCheatToolStripMenuItem_Click); - // - // removeCheatToolStripMenuItem - // - this.removeCheatToolStripMenuItem.Name = "removeCheatToolStripMenuItem"; - this.removeCheatToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.removeCheatToolStripMenuItem.Size = new System.Drawing.Size(201, 22); - this.removeCheatToolStripMenuItem.Text = "&Remove Cheat"; - this.removeCheatToolStripMenuItem.Click += new System.EventHandler(this.removeCheatToolStripMenuItem_Click); - // - // duplicateToolStripMenuItem - // - this.duplicateToolStripMenuItem.Name = "duplicateToolStripMenuItem"; - this.duplicateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(201, 22); - this.duplicateToolStripMenuItem.Text = "&Duplicate"; - this.duplicateToolStripMenuItem.Click += new System.EventHandler(this.duplicateToolStripMenuItem_Click); - // - // insertSeparatorToolStripMenuItem - // - this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem"; - this.insertSeparatorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); - this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(201, 22); - this.insertSeparatorToolStripMenuItem.Text = "Insert Separator"; - this.insertSeparatorToolStripMenuItem.Click += new System.EventHandler(this.insertSeparatorToolStripMenuItem_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(198, 6); - // - // moveUpToolStripMenuItem - // - this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; - this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); - this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(201, 22); - this.moveUpToolStripMenuItem.Text = "Move &Up"; - this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click); - // - // moveDownToolStripMenuItem - // - this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; - this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(201, 22); - this.moveDownToolStripMenuItem.Text = "Move &Down"; - this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click); - // - // toolStripSeparator6 - // - this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(198, 6); - // - // disableAllCheatsToolStripMenuItem - // - this.disableAllCheatsToolStripMenuItem.Name = "disableAllCheatsToolStripMenuItem"; - this.disableAllCheatsToolStripMenuItem.Size = new System.Drawing.Size(201, 22); - this.disableAllCheatsToolStripMenuItem.Text = "Disable all Cheats"; - this.disableAllCheatsToolStripMenuItem.Click += new System.EventHandler(this.disableAllCheatsToolStripMenuItem_Click); - // - // optionsToolStripMenuItem - // - this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(53, 20); + this.cheatsToolStripMenuItem.Text = "&Cheats"; + this.cheatsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.cheatsToolStripMenuItem_DropDownOpened); + // + // addCheatToolStripMenuItem + // + this.addCheatToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat; + this.addCheatToolStripMenuItem.Name = "addCheatToolStripMenuItem"; + this.addCheatToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.addCheatToolStripMenuItem.Text = "&Add Cheat"; + this.addCheatToolStripMenuItem.Click += new System.EventHandler(this.addCheatToolStripMenuItem_Click); + // + // removeCheatToolStripMenuItem + // + this.removeCheatToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_delete; + this.removeCheatToolStripMenuItem.Name = "removeCheatToolStripMenuItem"; + this.removeCheatToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); + this.removeCheatToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.removeCheatToolStripMenuItem.Text = "&Remove Cheat"; + this.removeCheatToolStripMenuItem.Click += new System.EventHandler(this.removeCheatToolStripMenuItem_Click); + // + // duplicateToolStripMenuItem + // + this.duplicateToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; + this.duplicateToolStripMenuItem.Name = "duplicateToolStripMenuItem"; + this.duplicateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); + this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.duplicateToolStripMenuItem.Text = "&Duplicate"; + this.duplicateToolStripMenuItem.Click += new System.EventHandler(this.duplicateToolStripMenuItem_Click); + // + // insertSeparatorToolStripMenuItem + // + this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InserSeparator; + this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem"; + this.insertSeparatorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); + this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.insertSeparatorToolStripMenuItem.Text = "Insert Separator"; + this.insertSeparatorToolStripMenuItem.Click += new System.EventHandler(this.insertSeparatorToolStripMenuItem_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(198, 6); + // + // moveUpToolStripMenuItem + // + this.moveUpToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_moveup; + this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; + this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); + this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.moveUpToolStripMenuItem.Text = "Move &Up"; + this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click); + // + // moveDownToolStripMenuItem + // + this.moveDownToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_movedown; + this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; + this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); + this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.moveDownToolStripMenuItem.Text = "Move &Down"; + this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click); + // + // toolStripSeparator6 + // + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(198, 6); + // + // disableAllCheatsToolStripMenuItem + // + this.disableAllCheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.disableAllCheatsToolStripMenuItem.Name = "disableAllCheatsToolStripMenuItem"; + this.disableAllCheatsToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.disableAllCheatsToolStripMenuItem.Text = "Disable all Cheats"; + this.disableAllCheatsToolStripMenuItem.Click += new System.EventHandler(this.disableAllCheatsToolStripMenuItem_Click); + // + // optionsToolStripMenuItem + // + this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.LoadCheatFileByGameToolStripMenuItem, this.saveCheatsOnCloseToolStripMenuItem, this.CheatsOnOffLoadToolStripMenuItem, @@ -303,61 +313,61 @@ this.saveWindowPositionToolStripMenuItem, this.toolStripSeparator5, this.restoreWindowSizeToolStripMenuItem}); - this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); - this.optionsToolStripMenuItem.Text = "&Options"; - this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); - // - // LoadCheatFileByGameToolStripMenuItem - // - this.LoadCheatFileByGameToolStripMenuItem.Name = "LoadCheatFileByGameToolStripMenuItem"; - this.LoadCheatFileByGameToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.LoadCheatFileByGameToolStripMenuItem.Text = "Load Cheat File by Game"; - this.LoadCheatFileByGameToolStripMenuItem.Click += new System.EventHandler(this.LoadCheatFileByGameToolStripMenuItem_Click); - // - // saveCheatsOnCloseToolStripMenuItem - // - this.saveCheatsOnCloseToolStripMenuItem.Name = "saveCheatsOnCloseToolStripMenuItem"; - this.saveCheatsOnCloseToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.saveCheatsOnCloseToolStripMenuItem.Text = "Save Cheats on Close"; - this.saveCheatsOnCloseToolStripMenuItem.Click += new System.EventHandler(this.saveCheatsOnCloseToolStripMenuItem_Click); - // - // CheatsOnOffLoadToolStripMenuItem - // - this.CheatsOnOffLoadToolStripMenuItem.Name = "CheatsOnOffLoadToolStripMenuItem"; - this.CheatsOnOffLoadToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.CheatsOnOffLoadToolStripMenuItem.Text = "Disable Cheats on Load"; - this.CheatsOnOffLoadToolStripMenuItem.Click += new System.EventHandler(this.CheatsOnOffLoadToolStripMenuItem_Click); - // - // autoloadDialogToolStripMenuItem - // - this.autoloadDialogToolStripMenuItem.Name = "autoloadDialogToolStripMenuItem"; - this.autoloadDialogToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.autoloadDialogToolStripMenuItem.Text = "Auto-load Dialog"; - this.autoloadDialogToolStripMenuItem.Click += new System.EventHandler(this.autoloadDialogToolStripMenuItem_Click); - // - // saveWindowPositionToolStripMenuItem - // - this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; - this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position"; - this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(201, 6); - // - // restoreWindowSizeToolStripMenuItem - // - this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem"; - this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.restoreWindowSizeToolStripMenuItem.Text = "Restore Default Settings"; - this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click); - // - // toolStrip1 - // - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); + this.optionsToolStripMenuItem.Text = "&Options"; + this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); + // + // LoadCheatFileByGameToolStripMenuItem + // + this.LoadCheatFileByGameToolStripMenuItem.Name = "LoadCheatFileByGameToolStripMenuItem"; + this.LoadCheatFileByGameToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.LoadCheatFileByGameToolStripMenuItem.Text = "Load Cheat File by Game"; + this.LoadCheatFileByGameToolStripMenuItem.Click += new System.EventHandler(this.LoadCheatFileByGameToolStripMenuItem_Click); + // + // saveCheatsOnCloseToolStripMenuItem + // + this.saveCheatsOnCloseToolStripMenuItem.Name = "saveCheatsOnCloseToolStripMenuItem"; + this.saveCheatsOnCloseToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.saveCheatsOnCloseToolStripMenuItem.Text = "Save Cheats on Close"; + this.saveCheatsOnCloseToolStripMenuItem.Click += new System.EventHandler(this.saveCheatsOnCloseToolStripMenuItem_Click); + // + // CheatsOnOffLoadToolStripMenuItem + // + this.CheatsOnOffLoadToolStripMenuItem.Name = "CheatsOnOffLoadToolStripMenuItem"; + this.CheatsOnOffLoadToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.CheatsOnOffLoadToolStripMenuItem.Text = "Disable Cheats on Load"; + this.CheatsOnOffLoadToolStripMenuItem.Click += new System.EventHandler(this.CheatsOnOffLoadToolStripMenuItem_Click); + // + // autoloadDialogToolStripMenuItem + // + this.autoloadDialogToolStripMenuItem.Name = "autoloadDialogToolStripMenuItem"; + this.autoloadDialogToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.autoloadDialogToolStripMenuItem.Text = "Auto-load Dialog"; + this.autoloadDialogToolStripMenuItem.Click += new System.EventHandler(this.autoloadDialogToolStripMenuItem_Click); + // + // saveWindowPositionToolStripMenuItem + // + this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position"; + this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(201, 6); + // + // restoreWindowSizeToolStripMenuItem + // + this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem"; + this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.restoreWindowSizeToolStripMenuItem.Text = "Restore Default Settings"; + this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click); + // + // toolStrip1 + // + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolStripButton, this.openToolStripButton, this.saveToolStripButton, @@ -368,371 +378,374 @@ this.toolStripSeparator2, this.toolStripButtonMoveUp, this.toolStripButtonMoveDown}); - this.toolStrip1.Location = new System.Drawing.Point(0, 24); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(509, 25); - this.toolStrip1.TabIndex = 2; - this.toolStrip1.Text = "toolStrip1"; - // - // newToolStripButton - // - this.newToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.newToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripButton.Image"))); - this.newToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.newToolStripButton.Name = "newToolStripButton"; - this.newToolStripButton.Size = new System.Drawing.Size(23, 22); - this.newToolStripButton.Text = "&New"; - this.newToolStripButton.Click += new System.EventHandler(this.newToolStripButton_Click); - // - // openToolStripButton - // - this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); - this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.openToolStripButton.Name = "openToolStripButton"; - this.openToolStripButton.Size = new System.Drawing.Size(23, 22); - this.openToolStripButton.Text = "&Open"; - this.openToolStripButton.Click += new System.EventHandler(this.openToolStripButton_Click); - // - // saveToolStripButton - // - this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); - this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveToolStripButton.Name = "saveToolStripButton"; - this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); - this.saveToolStripButton.Text = "&Save"; - this.saveToolStripButton.Click += new System.EventHandler(this.saveToolStripButton_Click); - // - // toolStripSeparator - // - this.toolStripSeparator.Name = "toolStripSeparator"; - this.toolStripSeparator.Size = new System.Drawing.Size(6, 25); - // - // cutToolStripButton - // - this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.cutToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_delete; - this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.cutToolStripButton.Name = "cutToolStripButton"; - this.cutToolStripButton.Size = new System.Drawing.Size(23, 22); - this.cutToolStripButton.Text = "&Remove"; - this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click); - // - // copyToolStripButton - // - this.copyToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.copyToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("copyToolStripButton.Image"))); - this.copyToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.copyToolStripButton.Name = "copyToolStripButton"; - this.copyToolStripButton.Size = new System.Drawing.Size(23, 22); - this.copyToolStripButton.Text = "&Duplicate"; - this.copyToolStripButton.Click += new System.EventHandler(this.copyToolStripButton_Click); - // - // toolStripButtonSeparator - // - this.toolStripButtonSeparator.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonSeparator.Image = global::BizHawk.MultiClient.Properties.Resources.InserSeparator; - this.toolStripButtonSeparator.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonSeparator.Name = "toolStripButtonSeparator"; - this.toolStripButtonSeparator.Size = new System.Drawing.Size(23, 22); - this.toolStripButtonSeparator.Text = "Insert Separator"; - this.toolStripButtonSeparator.Click += new System.EventHandler(this.toolStripButtonSeparator_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); - // - // toolStripButtonMoveUp - // - this.toolStripButtonMoveUp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonMoveUp.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_moveup; - this.toolStripButtonMoveUp.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonMoveUp.Name = "toolStripButtonMoveUp"; - this.toolStripButtonMoveUp.Size = new System.Drawing.Size(23, 22); - this.toolStripButtonMoveUp.Text = "toolStripButton1"; - this.toolStripButtonMoveUp.Click += new System.EventHandler(this.toolStripButtonMoveUp_Click); - // - // toolStripButtonMoveDown - // - this.toolStripButtonMoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButtonMoveDown.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_movedown; - this.toolStripButtonMoveDown.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButtonMoveDown.Name = "toolStripButtonMoveDown"; - this.toolStripButtonMoveDown.Size = new System.Drawing.Size(23, 22); - this.toolStripButtonMoveDown.Text = "Move Down"; - this.toolStripButtonMoveDown.Click += new System.EventHandler(this.toolStripButtonMoveDown_Click); - // - // MessageLabel - // - this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.MessageLabel.AutoSize = true; - this.MessageLabel.Location = new System.Drawing.Point(13, 312); - this.MessageLabel.Name = "MessageLabel"; - this.MessageLabel.Size = new System.Drawing.Size(31, 13); - this.MessageLabel.TabIndex = 3; - this.MessageLabel.Text = " "; - // - // AddCheatGroup - // - this.AddCheatGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.AddCheatGroup.Controls.Add(this.EditButton); - this.AddCheatGroup.Controls.Add(this.label6); - this.AddCheatGroup.Controls.Add(this.DomainComboBox); - this.AddCheatGroup.Controls.Add(this.label5); - this.AddCheatGroup.Controls.Add(this.label4); - this.AddCheatGroup.Controls.Add(this.AddCheatButton); - this.AddCheatGroup.Controls.Add(this.ValueBox); - this.AddCheatGroup.Controls.Add(this.AddressBox); - this.AddCheatGroup.Controls.Add(this.NameBox); - this.AddCheatGroup.Controls.Add(this.label3); - this.AddCheatGroup.Controls.Add(this.label2); - this.AddCheatGroup.Controls.Add(this.label1); - this.AddCheatGroup.Location = new System.Drawing.Point(327, 72); - this.AddCheatGroup.Name = "AddCheatGroup"; - this.AddCheatGroup.Size = new System.Drawing.Size(170, 236); - this.AddCheatGroup.TabIndex = 4; - this.AddCheatGroup.TabStop = false; - this.AddCheatGroup.Text = "Add Cheat"; - // - // EditButton - // - this.EditButton.Enabled = false; - this.EditButton.Location = new System.Drawing.Point(99, 195); - this.EditButton.Name = "EditButton"; - this.EditButton.Size = new System.Drawing.Size(65, 23); - this.EditButton.TabIndex = 11; - this.EditButton.Text = "&Edit"; - this.EditButton.UseVisualStyleBackColor = true; - this.EditButton.Click += new System.EventHandler(this.EditButton_Click); - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(7, 120); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(83, 13); - this.label6.TabIndex = 10; - this.label6.Text = "Memory Domain"; - // - // DomainComboBox - // - this.DomainComboBox.FormattingEnabled = true; - this.DomainComboBox.Location = new System.Drawing.Point(10, 136); - this.DomainComboBox.Name = "DomainComboBox"; - this.DomainComboBox.Size = new System.Drawing.Size(100, 21); - this.DomainComboBox.TabIndex = 9; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(80, 87); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(18, 13); - this.label5.TabIndex = 8; - this.label5.Text = "0x"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(80, 58); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(18, 13); - this.label4.TabIndex = 7; - this.label4.Text = "0x"; - // - // AddCheatButton - // - this.AddCheatButton.Enabled = false; - this.AddCheatButton.Location = new System.Drawing.Point(10, 195); - this.AddCheatButton.Name = "AddCheatButton"; - this.AddCheatButton.Size = new System.Drawing.Size(65, 23); - this.AddCheatButton.TabIndex = 6; - this.AddCheatButton.Text = "&Add"; - this.AddCheatButton.UseVisualStyleBackColor = true; - this.AddCheatButton.Click += new System.EventHandler(this.AddCheatButton_Click); - // - // ValueBox - // - this.ValueBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.ValueBox.Location = new System.Drawing.Point(99, 81); - this.ValueBox.MaxLength = 2; - this.ValueBox.Name = "ValueBox"; - this.ValueBox.Size = new System.Drawing.Size(65, 20); - this.ValueBox.TabIndex = 5; - this.ValueBox.TextChanged += new System.EventHandler(this.ValueBox_TextChanged); - this.ValueBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ValueBox_KeyPress); - // - // AddressBox - // - this.AddressBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; - this.AddressBox.Location = new System.Drawing.Point(99, 53); - this.AddressBox.MaxLength = 8; - this.AddressBox.Name = "AddressBox"; - this.AddressBox.Size = new System.Drawing.Size(65, 20); - this.AddressBox.TabIndex = 4; - this.AddressBox.TextChanged += new System.EventHandler(this.AddressBox_TextChanged); - this.AddressBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.AddressBox_KeyPress); - // - // NameBox - // - this.NameBox.Location = new System.Drawing.Point(64, 25); - this.NameBox.Name = "NameBox"; - this.NameBox.Size = new System.Drawing.Size(100, 20); - this.NameBox.TabIndex = 3; - this.NameBox.TextChanged += new System.EventHandler(this.NameBox_TextChanged); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(7, 84); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(34, 13); - this.label3.TabIndex = 2; - this.label3.Text = "Value"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(6, 56); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(45, 13); - this.label2.TabIndex = 1; - this.label2.Text = "Address"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(6, 28); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(35, 13); - this.label1.TabIndex = 0; - this.label1.Text = "Name"; - // - // NumCheatsLabel - // - this.NumCheatsLabel.AutoSize = true; - this.NumCheatsLabel.Location = new System.Drawing.Point(9, 52); - this.NumCheatsLabel.Name = "NumCheatsLabel"; - this.NumCheatsLabel.Size = new System.Drawing.Size(49, 13); - this.NumCheatsLabel.TabIndex = 5; - this.NumCheatsLabel.Text = "0 Cheats"; - // - // CheatListView - // - this.CheatListView.AllowColumnReorder = true; - this.CheatListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.CheatListView.AutoArrange = false; - this.CheatListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.toolStrip1.Location = new System.Drawing.Point(0, 24); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(509, 25); + this.toolStrip1.TabIndex = 2; + this.toolStrip1.Text = "toolStrip1"; + // + // newToolStripButton + // + this.newToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.newToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripButton.Image"))); + this.newToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.newToolStripButton.Name = "newToolStripButton"; + this.newToolStripButton.Size = new System.Drawing.Size(23, 22); + this.newToolStripButton.Text = "&New"; + this.newToolStripButton.Click += new System.EventHandler(this.newToolStripButton_Click); + // + // openToolStripButton + // + this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); + this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.openToolStripButton.Name = "openToolStripButton"; + this.openToolStripButton.Size = new System.Drawing.Size(23, 22); + this.openToolStripButton.Text = "&Open"; + this.openToolStripButton.Click += new System.EventHandler(this.openToolStripButton_Click); + // + // saveToolStripButton + // + this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); + this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveToolStripButton.Name = "saveToolStripButton"; + this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); + this.saveToolStripButton.Text = "&Save"; + this.saveToolStripButton.Click += new System.EventHandler(this.saveToolStripButton_Click); + // + // toolStripSeparator + // + this.toolStripSeparator.Name = "toolStripSeparator"; + this.toolStripSeparator.Size = new System.Drawing.Size(6, 25); + // + // cutToolStripButton + // + this.cutToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.cutToolStripButton.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_delete; + this.cutToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.cutToolStripButton.Name = "cutToolStripButton"; + this.cutToolStripButton.Size = new System.Drawing.Size(23, 22); + this.cutToolStripButton.Text = "&Remove"; + this.cutToolStripButton.Click += new System.EventHandler(this.cutToolStripButton_Click); + // + // copyToolStripButton + // + this.copyToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.copyToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("copyToolStripButton.Image"))); + this.copyToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.copyToolStripButton.Name = "copyToolStripButton"; + this.copyToolStripButton.Size = new System.Drawing.Size(23, 22); + this.copyToolStripButton.Text = "&Duplicate"; + this.copyToolStripButton.Click += new System.EventHandler(this.copyToolStripButton_Click); + // + // toolStripButtonSeparator + // + this.toolStripButtonSeparator.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonSeparator.Image = global::BizHawk.MultiClient.Properties.Resources.InserSeparator; + this.toolStripButtonSeparator.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonSeparator.Name = "toolStripButtonSeparator"; + this.toolStripButtonSeparator.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonSeparator.Text = "Insert Separator"; + this.toolStripButtonSeparator.Click += new System.EventHandler(this.toolStripButtonSeparator_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // toolStripButtonMoveUp + // + this.toolStripButtonMoveUp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonMoveUp.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_moveup; + this.toolStripButtonMoveUp.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonMoveUp.Name = "toolStripButtonMoveUp"; + this.toolStripButtonMoveUp.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonMoveUp.Text = "toolStripButton1"; + this.toolStripButtonMoveUp.Click += new System.EventHandler(this.toolStripButtonMoveUp_Click); + // + // toolStripButtonMoveDown + // + this.toolStripButtonMoveDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButtonMoveDown.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_movedown; + this.toolStripButtonMoveDown.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButtonMoveDown.Name = "toolStripButtonMoveDown"; + this.toolStripButtonMoveDown.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonMoveDown.Text = "Move Down"; + this.toolStripButtonMoveDown.Click += new System.EventHandler(this.toolStripButtonMoveDown_Click); + // + // MessageLabel + // + this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.MessageLabel.AutoSize = true; + this.MessageLabel.Location = new System.Drawing.Point(13, 312); + this.MessageLabel.Name = "MessageLabel"; + this.MessageLabel.Size = new System.Drawing.Size(31, 13); + this.MessageLabel.TabIndex = 3; + this.MessageLabel.Text = " "; + // + // AddCheatGroup + // + this.AddCheatGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.AddCheatGroup.Controls.Add(this.EditButton); + this.AddCheatGroup.Controls.Add(this.label6); + this.AddCheatGroup.Controls.Add(this.DomainComboBox); + this.AddCheatGroup.Controls.Add(this.label5); + this.AddCheatGroup.Controls.Add(this.label4); + this.AddCheatGroup.Controls.Add(this.AddCheatButton); + this.AddCheatGroup.Controls.Add(this.ValueBox); + this.AddCheatGroup.Controls.Add(this.AddressBox); + this.AddCheatGroup.Controls.Add(this.NameBox); + this.AddCheatGroup.Controls.Add(this.label3); + this.AddCheatGroup.Controls.Add(this.label2); + this.AddCheatGroup.Controls.Add(this.label1); + this.AddCheatGroup.Location = new System.Drawing.Point(327, 72); + this.AddCheatGroup.Name = "AddCheatGroup"; + this.AddCheatGroup.Size = new System.Drawing.Size(170, 236); + this.AddCheatGroup.TabIndex = 4; + this.AddCheatGroup.TabStop = false; + this.AddCheatGroup.Text = "Add Cheat"; + // + // EditButton + // + this.EditButton.Enabled = false; + this.EditButton.Location = new System.Drawing.Point(99, 195); + this.EditButton.Name = "EditButton"; + this.EditButton.Size = new System.Drawing.Size(65, 23); + this.EditButton.TabIndex = 11; + this.EditButton.Text = "&Edit"; + this.EditButton.UseVisualStyleBackColor = true; + this.EditButton.Click += new System.EventHandler(this.EditButton_Click); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(7, 120); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(83, 13); + this.label6.TabIndex = 10; + this.label6.Text = "Memory Domain"; + // + // DomainComboBox + // + this.DomainComboBox.FormattingEnabled = true; + this.DomainComboBox.Location = new System.Drawing.Point(10, 136); + this.DomainComboBox.Name = "DomainComboBox"; + this.DomainComboBox.Size = new System.Drawing.Size(100, 21); + this.DomainComboBox.TabIndex = 9; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(80, 87); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(18, 13); + this.label5.TabIndex = 8; + this.label5.Text = "0x"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(80, 58); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(18, 13); + this.label4.TabIndex = 7; + this.label4.Text = "0x"; + // + // AddCheatButton + // + this.AddCheatButton.Enabled = false; + this.AddCheatButton.Location = new System.Drawing.Point(10, 195); + this.AddCheatButton.Name = "AddCheatButton"; + this.AddCheatButton.Size = new System.Drawing.Size(65, 23); + this.AddCheatButton.TabIndex = 6; + this.AddCheatButton.Text = "&Add"; + this.AddCheatButton.UseVisualStyleBackColor = true; + this.AddCheatButton.Click += new System.EventHandler(this.AddCheatButton_Click); + // + // ValueBox + // + this.ValueBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.ValueBox.Location = new System.Drawing.Point(99, 81); + this.ValueBox.MaxLength = 2; + this.ValueBox.Name = "ValueBox"; + this.ValueBox.Size = new System.Drawing.Size(65, 20); + this.ValueBox.TabIndex = 5; + this.ValueBox.TextChanged += new System.EventHandler(this.ValueBox_TextChanged); + this.ValueBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ValueBox_KeyPress); + // + // AddressBox + // + this.AddressBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; + this.AddressBox.Location = new System.Drawing.Point(99, 53); + this.AddressBox.MaxLength = 8; + this.AddressBox.Name = "AddressBox"; + this.AddressBox.Size = new System.Drawing.Size(65, 20); + this.AddressBox.TabIndex = 4; + this.AddressBox.TextChanged += new System.EventHandler(this.AddressBox_TextChanged); + this.AddressBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.AddressBox_KeyPress); + // + // NameBox + // + this.NameBox.Location = new System.Drawing.Point(64, 25); + this.NameBox.Name = "NameBox"; + this.NameBox.Size = new System.Drawing.Size(100, 20); + this.NameBox.TabIndex = 3; + this.NameBox.TextChanged += new System.EventHandler(this.NameBox_TextChanged); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(7, 84); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(34, 13); + this.label3.TabIndex = 2; + this.label3.Text = "Value"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(6, 56); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(45, 13); + this.label2.TabIndex = 1; + this.label2.Text = "Address"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 28); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(35, 13); + this.label1.TabIndex = 0; + this.label1.Text = "Name"; + // + // NumCheatsLabel + // + this.NumCheatsLabel.AutoSize = true; + this.NumCheatsLabel.Location = new System.Drawing.Point(9, 52); + this.NumCheatsLabel.Name = "NumCheatsLabel"; + this.NumCheatsLabel.Size = new System.Drawing.Size(49, 13); + this.NumCheatsLabel.TabIndex = 5; + this.NumCheatsLabel.Text = "0 Cheats"; + // + // CheatListView + // + this.CheatListView.AllowColumnReorder = true; + this.CheatListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.CheatListView.AutoArrange = false; + this.CheatListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.CheatName, this.Address, this.Value, this.Domain, this.On}); - this.CheatListView.ContextMenuStrip = this.contextMenuStrip1; - this.CheatListView.FullRowSelect = true; - this.CheatListView.GridLines = true; - this.CheatListView.ItemCount = 0; - this.CheatListView.LabelEdit = true; - this.CheatListView.Location = new System.Drawing.Point(12, 72); - this.CheatListView.Name = "CheatListView"; - this.CheatListView.selectedItem = -1; - this.CheatListView.Size = new System.Drawing.Size(298, 236); - this.CheatListView.TabIndex = 0; - this.CheatListView.UseCompatibleStateImageBehavior = false; - this.CheatListView.View = System.Windows.Forms.View.Details; - this.CheatListView.ColumnReordered += new System.Windows.Forms.ColumnReorderedEventHandler(this.ColumnReorder); - this.CheatListView.Click += new System.EventHandler(this.CheatListView_Click); - this.CheatListView.SelectedIndexChanged += new System.EventHandler(this.CheatListView_SelectedIndexChanged); - this.CheatListView.DoubleClick += new System.EventHandler(this.CheatListView_DoubleClick); - this.CheatListView.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.CheatListView_AfterLabelEdit); - // - // CheatName - // - this.CheatName.Text = "Name"; - this.CheatName.Width = 104; - // - // Address - // - this.Address.Text = "Address"; - this.Address.Width = 52; - // - // Value - // - this.Value.Text = "Value"; - this.Value.Width = 40; - // - // Domain - // - this.Domain.Text = "Domain"; - this.Domain.Width = 58; - // - // On - // - this.On.Text = "On"; - this.On.Width = 40; - // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.CheatListView.ContextMenuStrip = this.contextMenuStrip1; + this.CheatListView.FullRowSelect = true; + this.CheatListView.GridLines = true; + this.CheatListView.ItemCount = 0; + this.CheatListView.LabelEdit = true; + this.CheatListView.Location = new System.Drawing.Point(12, 72); + this.CheatListView.Name = "CheatListView"; + this.CheatListView.selectedItem = -1; + this.CheatListView.Size = new System.Drawing.Size(298, 236); + this.CheatListView.TabIndex = 0; + this.CheatListView.UseCompatibleStateImageBehavior = false; + this.CheatListView.View = System.Windows.Forms.View.Details; + this.CheatListView.ColumnReordered += new System.Windows.Forms.ColumnReorderedEventHandler(this.ColumnReorder); + this.CheatListView.Click += new System.EventHandler(this.CheatListView_Click); + this.CheatListView.SelectedIndexChanged += new System.EventHandler(this.CheatListView_SelectedIndexChanged); + this.CheatListView.DoubleClick += new System.EventHandler(this.CheatListView_DoubleClick); + this.CheatListView.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.CheatListView_AfterLabelEdit); + // + // CheatName + // + this.CheatName.Text = "Name"; + this.CheatName.Width = 104; + // + // Address + // + this.Address.Text = "Address"; + this.Address.Width = 52; + // + // Value + // + this.Value.Text = "Value"; + this.Value.Width = 40; + // + // Domain + // + this.Domain.Text = "Domain"; + this.Domain.Width = 58; + // + // On + // + this.On.Text = "On"; + this.On.Width = 40; + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toggleToolStripMenuItem, this.removeSelectedToolStripMenuItem, this.disableAllCheatsToolStripMenuItem1}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(171, 70); - // - // toggleToolStripMenuItem - // - this.toggleToolStripMenuItem.Name = "toggleToolStripMenuItem"; - this.toggleToolStripMenuItem.Size = new System.Drawing.Size(170, 22); - this.toggleToolStripMenuItem.Text = "Toggle"; - this.toggleToolStripMenuItem.Click += new System.EventHandler(this.toggleToolStripMenuItem_Click); - // - // removeSelectedToolStripMenuItem - // - this.removeSelectedToolStripMenuItem.Name = "removeSelectedToolStripMenuItem"; - this.removeSelectedToolStripMenuItem.Size = new System.Drawing.Size(170, 22); - this.removeSelectedToolStripMenuItem.Text = "Remove Selected"; - this.removeSelectedToolStripMenuItem.Click += new System.EventHandler(this.removeSelectedToolStripMenuItem_Click); - // - // disableAllCheatsToolStripMenuItem1 - // - this.disableAllCheatsToolStripMenuItem1.Name = "disableAllCheatsToolStripMenuItem1"; - this.disableAllCheatsToolStripMenuItem1.Size = new System.Drawing.Size(170, 22); - this.disableAllCheatsToolStripMenuItem1.Text = "Disable All Cheats"; - this.disableAllCheatsToolStripMenuItem1.Click += new System.EventHandler(this.disableAllCheatsToolStripMenuItem1_Click); - // - // Cheats - // - this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(509, 328); - this.Controls.Add(this.NumCheatsLabel); - this.Controls.Add(this.AddCheatGroup); - this.Controls.Add(this.MessageLabel); - this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.CheatListView); - this.Controls.Add(this.CheatsMenu); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.CheatsMenu; - this.Name = "Cheats"; - this.Text = "Cheats"; - this.Load += new System.EventHandler(this.Cheats_Load); - this.DragDrop += new System.Windows.Forms.DragEventHandler(this.Cheats_DragDrop); - this.DragEnter += new System.Windows.Forms.DragEventHandler(this.Cheats_DragEnter); - this.CheatsMenu.ResumeLayout(false); - this.CheatsMenu.PerformLayout(); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.AddCheatGroup.ResumeLayout(false); - this.AddCheatGroup.PerformLayout(); - this.contextMenuStrip1.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(171, 70); + // + // toggleToolStripMenuItem + // + this.toggleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; + this.toggleToolStripMenuItem.Name = "toggleToolStripMenuItem"; + this.toggleToolStripMenuItem.Size = new System.Drawing.Size(170, 22); + this.toggleToolStripMenuItem.Text = "Toggle"; + this.toggleToolStripMenuItem.Click += new System.EventHandler(this.toggleToolStripMenuItem_Click); + // + // removeSelectedToolStripMenuItem + // + this.removeSelectedToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_delete; + this.removeSelectedToolStripMenuItem.Name = "removeSelectedToolStripMenuItem"; + this.removeSelectedToolStripMenuItem.Size = new System.Drawing.Size(170, 22); + this.removeSelectedToolStripMenuItem.Text = "Remove Selected"; + this.removeSelectedToolStripMenuItem.Click += new System.EventHandler(this.removeSelectedToolStripMenuItem_Click); + // + // disableAllCheatsToolStripMenuItem1 + // + this.disableAllCheatsToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.disableAllCheatsToolStripMenuItem1.Name = "disableAllCheatsToolStripMenuItem1"; + this.disableAllCheatsToolStripMenuItem1.Size = new System.Drawing.Size(170, 22); + this.disableAllCheatsToolStripMenuItem1.Text = "Disable All Cheats"; + this.disableAllCheatsToolStripMenuItem1.Click += new System.EventHandler(this.disableAllCheatsToolStripMenuItem1_Click); + // + // Cheats + // + this.AllowDrop = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(509, 328); + this.Controls.Add(this.NumCheatsLabel); + this.Controls.Add(this.AddCheatGroup); + this.Controls.Add(this.MessageLabel); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.CheatListView); + this.Controls.Add(this.CheatsMenu); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MainMenuStrip = this.CheatsMenu; + this.Name = "Cheats"; + this.Text = "Cheats"; + this.Load += new System.EventHandler(this.Cheats_Load); + this.DragDrop += new System.Windows.Forms.DragEventHandler(this.Cheats_DragDrop); + this.DragEnter += new System.Windows.Forms.DragEventHandler(this.Cheats_DragEnter); + this.CheatsMenu.ResumeLayout(false); + this.CheatsMenu.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.AddCheatGroup.ResumeLayout(false); + this.AddCheatGroup.PerformLayout(); + this.contextMenuStrip1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/BizHawk.MultiClient/tools/HexEditor.Designer.cs b/BizHawk.MultiClient/tools/HexEditor.Designer.cs index 40ecd13b03..467de1a83b 100644 --- a/BizHawk.MultiClient/tools/HexEditor.Designer.cs +++ b/BizHawk.MultiClient/tools/HexEditor.Designer.cs @@ -28,83 +28,85 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HexEditor)); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dumpToFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.memoryDomainsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dataSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.byteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.byteToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.byteToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); - this.enToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.goToAddressToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.addToRamWatchToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.freezeAddressToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveWindowsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AddressBox = new System.Windows.Forms.TextBox(); - this.ViewerContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); - this.pokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.freezeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.addToRamWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.MemoryViewer = new BizHawk.MultiClient.MemoryViewer(); - this.menuStrip1.SuspendLayout(); - this.ViewerContextMenuStrip.SuspendLayout(); - this.SuspendLayout(); - // - // menuStrip1 - // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HexEditor)); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dumpToFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.memoryDomainsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dataSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.byteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.byteToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.byteToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); + this.enToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.goToAddressToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.addToRamWatchToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.freezeAddressToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveWindowsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AddressBox = new System.Windows.Forms.TextBox(); + this.ViewerContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); + this.pokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.freezeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.addToRamWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MemoryViewer = new BizHawk.MultiClient.MemoryViewer(); + this.menuStrip1.SuspendLayout(); + this.ViewerContextMenuStrip.SuspendLayout(); + this.SuspendLayout(); + // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.optionsToolStripMenuItem, this.settingsToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(572, 24); - this.menuStrip1.TabIndex = 1; - this.menuStrip1.Text = "menuStrip1"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(572, 24); + this.menuStrip1.TabIndex = 1; + this.menuStrip1.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.dumpToFileToolStripMenuItem, this.toolStripSeparator1, this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); - this.fileToolStripMenuItem.Text = "&File"; - // - // dumpToFileToolStripMenuItem - // - this.dumpToFileToolStripMenuItem.Name = "dumpToFileToolStripMenuItem"; - this.dumpToFileToolStripMenuItem.Size = new System.Drawing.Size(154, 22); - this.dumpToFileToolStripMenuItem.Text = "&Dump to file..."; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(151, 6); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(154, 22); - this.exitToolStripMenuItem.Text = "E&xit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // optionsToolStripMenuItem - // - this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Text = "&File"; + // + // dumpToFileToolStripMenuItem + // + this.dumpToFileToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.dumpToFileToolStripMenuItem.Name = "dumpToFileToolStripMenuItem"; + this.dumpToFileToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.dumpToFileToolStripMenuItem.Text = "&Dump to file..."; + this.dumpToFileToolStripMenuItem.Click += new System.EventHandler(this.dumpToFileToolStripMenuItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(151, 6); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.exitToolStripMenuItem.Text = "E&xit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // optionsToolStripMenuItem + // + this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.memoryDomainsToolStripMenuItem, this.dataSizeToolStripMenuItem, this.enToolStripMenuItem, @@ -112,194 +114,199 @@ this.goToAddressToolStripMenuItem, this.addToRamWatchToolStripMenuItem1, this.freezeAddressToolStripMenuItem}); - this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); - this.optionsToolStripMenuItem.Text = "&Options"; - this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); - // - // memoryDomainsToolStripMenuItem - // - this.memoryDomainsToolStripMenuItem.Name = "memoryDomainsToolStripMenuItem"; - this.memoryDomainsToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.memoryDomainsToolStripMenuItem.Text = "&Memory Domains"; - this.memoryDomainsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.memoryDomainsToolStripMenuItem_DropDownOpened); - // - // dataSizeToolStripMenuItem - // - this.dataSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); + this.optionsToolStripMenuItem.Text = "&Options"; + this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); + // + // memoryDomainsToolStripMenuItem + // + this.memoryDomainsToolStripMenuItem.Name = "memoryDomainsToolStripMenuItem"; + this.memoryDomainsToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.memoryDomainsToolStripMenuItem.Text = "&Memory Domains"; + this.memoryDomainsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.memoryDomainsToolStripMenuItem_DropDownOpened); + // + // dataSizeToolStripMenuItem + // + this.dataSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.byteToolStripMenuItem, this.byteToolStripMenuItem1, this.byteToolStripMenuItem2}); - this.dataSizeToolStripMenuItem.Name = "dataSizeToolStripMenuItem"; - this.dataSizeToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.dataSizeToolStripMenuItem.Text = "Data Size"; - // - // byteToolStripMenuItem - // - this.byteToolStripMenuItem.Name = "byteToolStripMenuItem"; - this.byteToolStripMenuItem.Size = new System.Drawing.Size(116, 22); - this.byteToolStripMenuItem.Text = "1 Byte"; - this.byteToolStripMenuItem.Click += new System.EventHandler(this.byteToolStripMenuItem_Click); - // - // byteToolStripMenuItem1 - // - this.byteToolStripMenuItem1.Name = "byteToolStripMenuItem1"; - this.byteToolStripMenuItem1.Size = new System.Drawing.Size(116, 22); - this.byteToolStripMenuItem1.Text = "2 Byte"; - this.byteToolStripMenuItem1.Click += new System.EventHandler(this.byteToolStripMenuItem1_Click); - // - // byteToolStripMenuItem2 - // - this.byteToolStripMenuItem2.Name = "byteToolStripMenuItem2"; - this.byteToolStripMenuItem2.Size = new System.Drawing.Size(116, 22); - this.byteToolStripMenuItem2.Text = "4 Byte"; - this.byteToolStripMenuItem2.Click += new System.EventHandler(this.byteToolStripMenuItem2_Click); - // - // enToolStripMenuItem - // - this.enToolStripMenuItem.Name = "enToolStripMenuItem"; - this.enToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.enToolStripMenuItem.Text = "Big Endian"; - this.enToolStripMenuItem.Click += new System.EventHandler(this.enToolStripMenuItem_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(201, 6); - // - // goToAddressToolStripMenuItem - // - this.goToAddressToolStripMenuItem.Name = "goToAddressToolStripMenuItem"; - this.goToAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); - this.goToAddressToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.goToAddressToolStripMenuItem.Text = "&Go to Address..."; - this.goToAddressToolStripMenuItem.Click += new System.EventHandler(this.goToAddressToolStripMenuItem_Click); - // - // addToRamWatchToolStripMenuItem1 - // - this.addToRamWatchToolStripMenuItem1.Name = "addToRamWatchToolStripMenuItem1"; - this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(204, 22); - this.addToRamWatchToolStripMenuItem1.Text = "Add to Ram Watch"; - this.addToRamWatchToolStripMenuItem1.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem1_Click); - // - // freezeAddressToolStripMenuItem - // - this.freezeAddressToolStripMenuItem.Name = "freezeAddressToolStripMenuItem"; - this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(204, 22); - this.freezeAddressToolStripMenuItem.Text = "&Freeze Address"; - this.freezeAddressToolStripMenuItem.Click += new System.EventHandler(this.freezeAddressToolStripMenuItem_Click); - // - // settingsToolStripMenuItem - // - this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.dataSizeToolStripMenuItem.Name = "dataSizeToolStripMenuItem"; + this.dataSizeToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.dataSizeToolStripMenuItem.Text = "Data Size"; + // + // byteToolStripMenuItem + // + this.byteToolStripMenuItem.Name = "byteToolStripMenuItem"; + this.byteToolStripMenuItem.Size = new System.Drawing.Size(116, 22); + this.byteToolStripMenuItem.Text = "1 Byte"; + this.byteToolStripMenuItem.Click += new System.EventHandler(this.byteToolStripMenuItem_Click); + // + // byteToolStripMenuItem1 + // + this.byteToolStripMenuItem1.Name = "byteToolStripMenuItem1"; + this.byteToolStripMenuItem1.Size = new System.Drawing.Size(116, 22); + this.byteToolStripMenuItem1.Text = "2 Byte"; + this.byteToolStripMenuItem1.Click += new System.EventHandler(this.byteToolStripMenuItem1_Click); + // + // byteToolStripMenuItem2 + // + this.byteToolStripMenuItem2.Name = "byteToolStripMenuItem2"; + this.byteToolStripMenuItem2.Size = new System.Drawing.Size(116, 22); + this.byteToolStripMenuItem2.Text = "4 Byte"; + this.byteToolStripMenuItem2.Click += new System.EventHandler(this.byteToolStripMenuItem2_Click); + // + // enToolStripMenuItem + // + this.enToolStripMenuItem.Name = "enToolStripMenuItem"; + this.enToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.enToolStripMenuItem.Text = "Big Endian"; + this.enToolStripMenuItem.Click += new System.EventHandler(this.enToolStripMenuItem_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(201, 6); + // + // goToAddressToolStripMenuItem + // + this.goToAddressToolStripMenuItem.Name = "goToAddressToolStripMenuItem"; + this.goToAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); + this.goToAddressToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.goToAddressToolStripMenuItem.Text = "&Go to Address..."; + this.goToAddressToolStripMenuItem.Click += new System.EventHandler(this.goToAddressToolStripMenuItem_Click); + // + // addToRamWatchToolStripMenuItem1 + // + this.addToRamWatchToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.addToRamWatchToolStripMenuItem1.Name = "addToRamWatchToolStripMenuItem1"; + this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(204, 22); + this.addToRamWatchToolStripMenuItem1.Text = "Add to Ram Watch"; + this.addToRamWatchToolStripMenuItem1.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem1_Click); + // + // freezeAddressToolStripMenuItem + // + this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat; + this.freezeAddressToolStripMenuItem.Name = "freezeAddressToolStripMenuItem"; + this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.freezeAddressToolStripMenuItem.Text = "&Freeze Address"; + this.freezeAddressToolStripMenuItem.Click += new System.EventHandler(this.freezeAddressToolStripMenuItem_Click); + // + // settingsToolStripMenuItem + // + this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.autoloadToolStripMenuItem, this.saveWindowsSettingsToolStripMenuItem, this.toolStripSeparator3, this.restoreWindowSizeToolStripMenuItem}); - this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(58, 20); - this.settingsToolStripMenuItem.Text = "&Settings"; - this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_DropDownOpened); - // - // restoreWindowSizeToolStripMenuItem - // - this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem"; - this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(194, 22); - this.restoreWindowSizeToolStripMenuItem.Text = "&Restore Window Size"; - this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click); - // - // autoloadToolStripMenuItem - // - this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem"; - this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(194, 22); - this.autoloadToolStripMenuItem.Text = "Auto-load"; - this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click); - // - // saveWindowsSettingsToolStripMenuItem - // - this.saveWindowsSettingsToolStripMenuItem.Name = "saveWindowsSettingsToolStripMenuItem"; - this.saveWindowsSettingsToolStripMenuItem.Size = new System.Drawing.Size(194, 22); - this.saveWindowsSettingsToolStripMenuItem.Text = "Save windows settings"; - this.saveWindowsSettingsToolStripMenuItem.Click += new System.EventHandler(this.saveWindowsSettingsToolStripMenuItem_Click); - // - // AddressBox - // - this.AddressBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.AddressBox.Location = new System.Drawing.Point(487, 37); - this.AddressBox.Name = "AddressBox"; - this.AddressBox.ReadOnly = true; - this.AddressBox.Size = new System.Drawing.Size(57, 20); - this.AddressBox.TabIndex = 2; - // - // ViewerContextMenuStrip - // - this.ViewerContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(58, 20); + this.settingsToolStripMenuItem.Text = "&Settings"; + this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_DropDownOpened); + // + // autoloadToolStripMenuItem + // + this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem"; + this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.autoloadToolStripMenuItem.Text = "Auto-load"; + this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click); + // + // saveWindowsSettingsToolStripMenuItem + // + this.saveWindowsSettingsToolStripMenuItem.Name = "saveWindowsSettingsToolStripMenuItem"; + this.saveWindowsSettingsToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.saveWindowsSettingsToolStripMenuItem.Text = "Save windows settings"; + this.saveWindowsSettingsToolStripMenuItem.Click += new System.EventHandler(this.saveWindowsSettingsToolStripMenuItem_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(191, 6); + // + // restoreWindowSizeToolStripMenuItem + // + this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem"; + this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.restoreWindowSizeToolStripMenuItem.Text = "&Restore Window Size"; + this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click); + // + // AddressBox + // + this.AddressBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.AddressBox.Location = new System.Drawing.Point(487, 37); + this.AddressBox.Name = "AddressBox"; + this.AddressBox.ReadOnly = true; + this.AddressBox.Size = new System.Drawing.Size(57, 20); + this.AddressBox.TabIndex = 2; + // + // ViewerContextMenuStrip + // + this.ViewerContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pokeToolStripMenuItem, this.freezeToolStripMenuItem, this.addToRamWatchToolStripMenuItem}); - this.ViewerContextMenuStrip.Name = "ViewerContextMenuStrip"; - this.ViewerContextMenuStrip.Size = new System.Drawing.Size(176, 70); - // - // pokeToolStripMenuItem - // - this.pokeToolStripMenuItem.Name = "pokeToolStripMenuItem"; - this.pokeToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.pokeToolStripMenuItem.Text = "&Poke"; - this.pokeToolStripMenuItem.Click += new System.EventHandler(this.pokeToolStripMenuItem_Click); - // - // freezeToolStripMenuItem - // - this.freezeToolStripMenuItem.Name = "freezeToolStripMenuItem"; - this.freezeToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.freezeToolStripMenuItem.Text = "&Freeze"; - this.freezeToolStripMenuItem.Click += new System.EventHandler(this.freezeToolStripMenuItem_Click); - // - // addToRamWatchToolStripMenuItem - // - this.addToRamWatchToolStripMenuItem.Name = "addToRamWatchToolStripMenuItem"; - this.addToRamWatchToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.addToRamWatchToolStripMenuItem.Text = "&Add to Ram Watch"; - this.addToRamWatchToolStripMenuItem.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(191, 6); - // - // MemoryViewer - // - this.MemoryViewer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.MemoryViewer.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.MemoryViewer.ContextMenuStrip = this.ViewerContextMenuStrip; - this.MemoryViewer.Location = new System.Drawing.Point(12, 37); - this.MemoryViewer.Name = "MemoryViewer"; - this.MemoryViewer.Size = new System.Drawing.Size(458, 295); - this.MemoryViewer.TabIndex = 0; - this.MemoryViewer.Text = "RAM"; - this.MemoryViewer.Paint += new System.Windows.Forms.PaintEventHandler(this.MemoryViewer_Paint); - this.MemoryViewer.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.MemoryViewer_MouseDoubleClick); - // - // HexEditor - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(572, 344); - this.Controls.Add(this.AddressBox); - this.Controls.Add(this.MemoryViewer); - this.Controls.Add(this.menuStrip1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.menuStrip1; - this.Name = "HexEditor"; - this.Text = "HexEditor"; - this.Load += new System.EventHandler(this.HexEditor_Load); - this.Resize += new System.EventHandler(this.HexEditor_Resize); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.ViewerContextMenuStrip.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); + this.ViewerContextMenuStrip.Name = "ViewerContextMenuStrip"; + this.ViewerContextMenuStrip.Size = new System.Drawing.Size(176, 70); + // + // pokeToolStripMenuItem + // + this.pokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.pokeToolStripMenuItem.Name = "pokeToolStripMenuItem"; + this.pokeToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.pokeToolStripMenuItem.Text = "&Poke"; + this.pokeToolStripMenuItem.Click += new System.EventHandler(this.pokeToolStripMenuItem_Click); + // + // freezeToolStripMenuItem + // + this.freezeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat; + this.freezeToolStripMenuItem.Name = "freezeToolStripMenuItem"; + this.freezeToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.freezeToolStripMenuItem.Text = "&Freeze"; + this.freezeToolStripMenuItem.Click += new System.EventHandler(this.freezeToolStripMenuItem_Click); + // + // addToRamWatchToolStripMenuItem + // + this.addToRamWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.addToRamWatchToolStripMenuItem.Name = "addToRamWatchToolStripMenuItem"; + this.addToRamWatchToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.addToRamWatchToolStripMenuItem.Text = "&Add to Ram Watch"; + this.addToRamWatchToolStripMenuItem.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem_Click); + // + // MemoryViewer + // + this.MemoryViewer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.MemoryViewer.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.MemoryViewer.ContextMenuStrip = this.ViewerContextMenuStrip; + this.MemoryViewer.Location = new System.Drawing.Point(12, 37); + this.MemoryViewer.Name = "MemoryViewer"; + this.MemoryViewer.Size = new System.Drawing.Size(458, 295); + this.MemoryViewer.TabIndex = 0; + this.MemoryViewer.Text = "RAM"; + this.MemoryViewer.Paint += new System.Windows.Forms.PaintEventHandler(this.MemoryViewer_Paint); + this.MemoryViewer.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.MemoryViewer_MouseDoubleClick); + // + // HexEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(572, 344); + this.Controls.Add(this.AddressBox); + this.Controls.Add(this.MemoryViewer); + this.Controls.Add(this.menuStrip1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MainMenuStrip = this.menuStrip1; + this.Name = "HexEditor"; + this.Text = "HexEditor"; + this.Load += new System.EventHandler(this.HexEditor_Load); + this.Resize += new System.EventHandler(this.HexEditor_Resize); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.ViewerContextMenuStrip.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs index ecf451aa19..b27ac3788d 100644 --- a/BizHawk.MultiClient/tools/HexEditor.cs +++ b/BizHawk.MultiClient/tools/HexEditor.cs @@ -358,5 +358,10 @@ namespace BizHawk.MultiClient { CheckDomainMenuItems(); } + + private void dumpToFileToolStripMenuItem_Click(object sender, EventArgs e) + { + + } } } diff --git a/BizHawk.MultiClient/tools/LuaConsole.Designer.cs b/BizHawk.MultiClient/tools/LuaConsole.Designer.cs index d58d53abeb..2f868c124a 100644 --- a/BizHawk.MultiClient/tools/LuaConsole.Designer.cs +++ b/BizHawk.MultiClient/tools/LuaConsole.Designer.cs @@ -130,6 +130,7 @@ // // newToolStripMenuItem // + this.newToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile; this.newToolStripMenuItem.Name = "newToolStripMenuItem"; this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); this.newToolStripMenuItem.Size = new System.Drawing.Size(204, 22); @@ -137,6 +138,7 @@ // // openToolStripMenuItem // + this.openToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.openToolStripMenuItem.Size = new System.Drawing.Size(204, 22); @@ -145,6 +147,7 @@ // // saveToolStripMenuItem // + this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.saveToolStripMenuItem.Size = new System.Drawing.Size(204, 22); @@ -224,12 +227,14 @@ // // insertSeparatorToolStripMenuItem // + this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InserSeparator; this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem"; this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.insertSeparatorToolStripMenuItem.Text = "Insert Separator"; // // turnOffAllScriptsToolStripMenuItem // + this.turnOffAllScriptsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.turnOffAllScriptsToolStripMenuItem.Name = "turnOffAllScriptsToolStripMenuItem"; this.turnOffAllScriptsToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.turnOffAllScriptsToolStripMenuItem.Text = "Turn Off All Scripts"; @@ -247,26 +252,29 @@ // // removeToolStripMenuItem // + this.removeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_delete; this.removeToolStripMenuItem.Name = "removeToolStripMenuItem"; - this.removeToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.removeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.removeToolStripMenuItem.Text = "Remove"; // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(138, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6); // // moveUpToolStripMenuItem // + this.moveUpToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_moveup; this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; - this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.moveUpToolStripMenuItem.Text = "Move Up"; this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click); // // moveDownToolStripMenuItem // + this.moveDownToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_movedown; this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; - this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.moveDownToolStripMenuItem.Text = "Move Down"; this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click); // diff --git a/BizHawk.MultiClient/tools/RamSearch.Designer.cs b/BizHawk.MultiClient/tools/RamSearch.Designer.cs index 5013eda2c3..c18284a792 100644 --- a/BizHawk.MultiClient/tools/RamSearch.Designer.cs +++ b/BizHawk.MultiClient/tools/RamSearch.Designer.cs @@ -325,6 +325,7 @@ // // startNewSearchToolStripMenuItem // + this.startNewSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; this.startNewSearchToolStripMenuItem.Name = "startNewSearchToolStripMenuItem"; this.startNewSearchToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.startNewSearchToolStripMenuItem.Text = "&Start New Search"; @@ -332,6 +333,7 @@ // // searchToolStripMenuItem2 // + this.searchToolStripMenuItem2.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.searchToolStripMenuItem2.Name = "searchToolStripMenuItem2"; this.searchToolStripMenuItem2.Size = new System.Drawing.Size(175, 22); this.searchToolStripMenuItem2.Text = "&Search"; @@ -344,6 +346,7 @@ // // removeSelectedToolStripMenuItem1 // + this.removeSelectedToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_delete; this.removeSelectedToolStripMenuItem1.Name = "removeSelectedToolStripMenuItem1"; this.removeSelectedToolStripMenuItem1.Size = new System.Drawing.Size(175, 22); this.removeSelectedToolStripMenuItem1.Text = "Remove Selected"; @@ -351,6 +354,7 @@ // // addToRamWatchToolStripMenuItem // + this.addToRamWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.addToRamWatchToolStripMenuItem.Name = "addToRamWatchToolStripMenuItem"; this.addToRamWatchToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.addToRamWatchToolStripMenuItem.Text = "Add to Ram Watch"; @@ -358,6 +362,7 @@ // // pokeAddressToolStripMenuItem1 // + this.pokeAddressToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.pokeAddressToolStripMenuItem1.Name = "pokeAddressToolStripMenuItem1"; this.pokeAddressToolStripMenuItem1.Size = new System.Drawing.Size(175, 22); this.pokeAddressToolStripMenuItem1.Text = "Poke Address"; @@ -365,6 +370,7 @@ // // freezeAddressToolStripMenuItem1 // + this.freezeAddressToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.cheat; this.freezeAddressToolStripMenuItem1.Name = "freezeAddressToolStripMenuItem1"; this.freezeAddressToolStripMenuItem1.Size = new System.Drawing.Size(175, 22); this.freezeAddressToolStripMenuItem1.Text = "Freeze Address"; @@ -401,6 +407,7 @@ // // newSearchToolStripMenuItem // + this.newSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; this.newSearchToolStripMenuItem.Name = "newSearchToolStripMenuItem"; this.newSearchToolStripMenuItem.Size = new System.Drawing.Size(204, 22); this.newSearchToolStripMenuItem.Text = "&New Search"; @@ -413,6 +420,7 @@ // // openToolStripMenuItem // + this.openToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.openToolStripMenuItem.Size = new System.Drawing.Size(204, 22); @@ -421,6 +429,7 @@ // // saveToolStripMenuItem // + this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.saveToolStripMenuItem.Size = new System.Drawing.Size(204, 22); @@ -445,6 +454,7 @@ // // TruncateFromFileToolStripMenuItem // + this.TruncateFromFileToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TruncateFromFile; this.TruncateFromFileToolStripMenuItem.Name = "TruncateFromFileToolStripMenuItem"; this.TruncateFromFileToolStripMenuItem.Size = new System.Drawing.Size(204, 22); this.TruncateFromFileToolStripMenuItem.Text = "&Truncate from File..."; @@ -526,6 +536,7 @@ // // searchToolStripMenuItem1 // + this.searchToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.searchToolStripMenuItem1.Name = "searchToolStripMenuItem1"; this.searchToolStripMenuItem1.Size = new System.Drawing.Size(218, 22); this.searchToolStripMenuItem1.Text = "&Search"; @@ -533,6 +544,7 @@ // // undoToolStripMenuItem // + this.undoToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo; this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; this.undoToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.undoToolStripMenuItem.Text = "&Undo"; @@ -540,6 +552,7 @@ // // copyValueToPrevToolStripMenuItem // + this.copyValueToPrevToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; this.copyValueToPrevToolStripMenuItem.Name = "copyValueToPrevToolStripMenuItem"; this.copyValueToPrevToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.copyValueToPrevToolStripMenuItem.Text = "Copy Value to Prev"; @@ -554,6 +567,7 @@ // // removeSelectedToolStripMenuItem // + this.removeSelectedToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_delete; this.removeSelectedToolStripMenuItem.Name = "removeSelectedToolStripMenuItem"; this.removeSelectedToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.removeSelectedToolStripMenuItem.Text = "&Remove selected"; @@ -573,6 +587,7 @@ // // addSelectedToRamWatchToolStripMenuItem // + this.addSelectedToRamWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.addSelectedToRamWatchToolStripMenuItem.Name = "addSelectedToRamWatchToolStripMenuItem"; this.addSelectedToRamWatchToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.addSelectedToRamWatchToolStripMenuItem.Text = "&Add selected to Ram Watch"; @@ -580,6 +595,7 @@ // // pokeAddressToolStripMenuItem // + this.pokeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.pokeAddressToolStripMenuItem.Name = "pokeAddressToolStripMenuItem"; this.pokeAddressToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.pokeAddressToolStripMenuItem.Text = "&Poke Address"; @@ -587,6 +603,7 @@ // // freezeAddressToolStripMenuItem // + this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat; this.freezeAddressToolStripMenuItem.Name = "freezeAddressToolStripMenuItem"; this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.freezeAddressToolStripMenuItem.Text = "Freeze Address"; diff --git a/BizHawk.MultiClient/tools/RamWatch.Designer.cs b/BizHawk.MultiClient/tools/RamWatch.Designer.cs index b18ccfb4ed..253b73e59a 100644 --- a/BizHawk.MultiClient/tools/RamWatch.Designer.cs +++ b/BizHawk.MultiClient/tools/RamWatch.Designer.cs @@ -139,6 +139,7 @@ // // newListToolStripMenuItem // + this.newListToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile; this.newListToolStripMenuItem.Name = "newListToolStripMenuItem"; this.newListToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); this.newListToolStripMenuItem.Size = new System.Drawing.Size(204, 22); @@ -147,6 +148,7 @@ // // openToolStripMenuItem // + this.openToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.openToolStripMenuItem.Size = new System.Drawing.Size(204, 22); @@ -155,6 +157,7 @@ // // saveToolStripMenuItem // + this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.saveToolStripMenuItem.Size = new System.Drawing.Size(204, 22); @@ -260,6 +263,7 @@ // // newWatchToolStripMenuItem // + this.newWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.newWatchToolStripMenuItem.Name = "newWatchToolStripMenuItem"; this.newWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); this.newWatchToolStripMenuItem.Size = new System.Drawing.Size(222, 22); @@ -268,6 +272,7 @@ // // editWatchToolStripMenuItem // + this.editWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; this.editWatchToolStripMenuItem.Name = "editWatchToolStripMenuItem"; this.editWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); this.editWatchToolStripMenuItem.Size = new System.Drawing.Size(222, 22); @@ -276,6 +281,7 @@ // // removeWatchToolStripMenuItem // + this.removeWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_delete; this.removeWatchToolStripMenuItem.Name = "removeWatchToolStripMenuItem"; this.removeWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); this.removeWatchToolStripMenuItem.Size = new System.Drawing.Size(222, 22); @@ -284,6 +290,7 @@ // // duplicateWatchToolStripMenuItem // + this.duplicateWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; this.duplicateWatchToolStripMenuItem.Name = "duplicateWatchToolStripMenuItem"; this.duplicateWatchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); this.duplicateWatchToolStripMenuItem.Size = new System.Drawing.Size(222, 22); @@ -292,6 +299,7 @@ // // pokeAddressToolStripMenuItem // + this.pokeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.pokeAddressToolStripMenuItem.Name = "pokeAddressToolStripMenuItem"; this.pokeAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); this.pokeAddressToolStripMenuItem.Size = new System.Drawing.Size(222, 22); @@ -300,6 +308,7 @@ // // freezeAddressToolStripMenuItem // + this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat; 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); @@ -308,6 +317,7 @@ // // insertSeparatorToolStripMenuItem // + this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InserSeparator; this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem"; this.insertSeparatorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(222, 22); @@ -329,6 +339,7 @@ // // moveUpToolStripMenuItem // + this.moveUpToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_moveup; this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up))); this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(222, 22); @@ -337,6 +348,7 @@ // // moveDownToolStripMenuItem // + this.moveDownToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_movedown; this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down))); this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(222, 22); @@ -471,6 +483,7 @@ // // editToolStripMenuItem // + this.editToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; this.editToolStripMenuItem.Name = "editToolStripMenuItem"; this.editToolStripMenuItem.Size = new System.Drawing.Size(227, 22); this.editToolStripMenuItem.Text = "&Edit"; @@ -478,6 +491,7 @@ // // removeToolStripMenuItem // + this.removeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_delete; this.removeToolStripMenuItem.Name = "removeToolStripMenuItem"; this.removeToolStripMenuItem.Size = new System.Drawing.Size(227, 22); this.removeToolStripMenuItem.Text = "&Remove"; @@ -485,6 +499,7 @@ // // duplicateToolStripMenuItem // + this.duplicateToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; this.duplicateToolStripMenuItem.Name = "duplicateToolStripMenuItem"; this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(227, 22); this.duplicateToolStripMenuItem.Text = "&Duplicate"; @@ -492,6 +507,7 @@ // // pokeToolStripMenuItem // + this.pokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.pokeToolStripMenuItem.Name = "pokeToolStripMenuItem"; this.pokeToolStripMenuItem.Size = new System.Drawing.Size(227, 22); this.pokeToolStripMenuItem.Text = "&Poke"; @@ -499,6 +515,7 @@ // // freezeToolStripMenuItem // + this.freezeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.cheat; this.freezeToolStripMenuItem.Name = "freezeToolStripMenuItem"; this.freezeToolStripMenuItem.Size = new System.Drawing.Size(227, 22); this.freezeToolStripMenuItem.Text = "&Freeze"; @@ -518,6 +535,7 @@ // // insertSeperatorToolStripMenuItem // + this.insertSeperatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InserSeparator; this.insertSeperatorToolStripMenuItem.Name = "insertSeperatorToolStripMenuItem"; this.insertSeperatorToolStripMenuItem.Size = new System.Drawing.Size(227, 22); this.insertSeperatorToolStripMenuItem.Text = "&Insert Separator"; @@ -525,6 +543,7 @@ // // moveUpToolStripMenuItem1 // + this.moveUpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_moveup; this.moveUpToolStripMenuItem1.Name = "moveUpToolStripMenuItem1"; this.moveUpToolStripMenuItem1.Size = new System.Drawing.Size(227, 22); this.moveUpToolStripMenuItem1.Text = "Move &Up"; @@ -532,6 +551,7 @@ // // moveDownToolStripMenuItem1 // + this.moveDownToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.BuilderDialog_movedown; this.moveDownToolStripMenuItem1.Name = "moveDownToolStripMenuItem1"; this.moveDownToolStripMenuItem1.Size = new System.Drawing.Size(227, 22); this.moveDownToolStripMenuItem1.Text = "Move &Down";