diff --git a/GUI.NET/Config/CheatInfo.cs b/GUI.NET/Config/CheatInfo.cs new file mode 100644 index 00000000..048c8f53 --- /dev/null +++ b/GUI.NET/Config/CheatInfo.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mesen.GUI.Config +{ + public enum CheatType + { + GameGenie = 0, + ProActionRocky = 1, + Custom = 2 + } + + public class CheatInfo + { + public bool Enabled; + public string CheatName; + public string GameName; + public string GameHash; + public CheatType CheatType; + public string Code; + public UInt32 Address; + public Byte Value; + public Byte CompareValue; + public bool IsRelativeAddress; + + public override string ToString() + { + if(CheatType == CheatType.Custom) { + return !IsRelativeAddress ? "!" : "" + string.Format("{0:X4}:{1:X2}:{2:X2}", Address, Value, CompareValue); + } else { + return Code; + } + } + } +} diff --git a/GUI.NET/Config/ClientConnection.cs b/GUI.NET/Config/ClientConnection.cs new file mode 100644 index 00000000..64360a75 --- /dev/null +++ b/GUI.NET/Config/ClientConnection.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mesen.GUI.Config +{ + public class ClientConnectionInfo + { + public string Host = "localhost"; + public UInt16 Port = 8888; + } +} diff --git a/GUI.NET/Config/ConfigManager.cs b/GUI.NET/Config/ConfigManager.cs new file mode 100644 index 00000000..a49ed6a0 --- /dev/null +++ b/GUI.NET/Config/ConfigManager.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.IO; +using System.Xml.Serialization; +using System.Drawing; +using System.Drawing.Imaging; +using System.Drawing.Drawing2D; + +namespace Mesen.GUI.Config +{ + class ConfigManager + { + private static Configuration _config; + private static Configuration _dirtyConfig; + + private static void LoadConfig() + { + if(_config == null) { + if(File.Exists(ConfigFile)) { + _config = Configuration.Deserialize(ConfigFile); + _dirtyConfig = Configuration.Deserialize(ConfigFile); + } else { + //Create new config file and save it to disk + _config = new Configuration(); + _dirtyConfig = new Configuration(); + SaveConfig(); + } + } + } + + private static void SaveConfig() + { + _config.Serialize(ConfigFile); + } + + private static string ConfigFile + { + get + { + string configPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData, Environment.SpecialFolderOption.Create), "Mesen"); + if(!Directory.Exists(configPath)) { + Directory.CreateDirectory(configPath); + } + + return Path.Combine(configPath, "settings.xml"); + } + } + + public static Configuration Config + { + get + { + LoadConfig(); + return _dirtyConfig; + } + } + + public static void ApplyChanges() + { + _config = _dirtyConfig.Clone(); + SaveConfig(); + } + + public static void RejectChanges() + { + _dirtyConfig = _config.Clone(); + } + } +} diff --git a/GUI.NET/Config/Configuration.cs b/GUI.NET/Config/Configuration.cs new file mode 100644 index 00000000..891630c1 --- /dev/null +++ b/GUI.NET/Config/Configuration.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Serialization; + +namespace Mesen.GUI.Config +{ + public class Configuration + { + private const int MaxRecentFiles = 10; + + public PlayerProfile Profile; + public ClientConnectionInfo ClientConnectionInfo; + public ServerInfo ServerInfo; + public List RecentFiles; + public List Cheats; + + public Configuration() + { + Profile = new PlayerProfile(); + ClientConnectionInfo = new ClientConnectionInfo(); + ServerInfo = new ServerInfo(); + RecentFiles = new List(); + } + + public void AddRecentFile(string filepath) + { + if(RecentFiles.Contains(filepath)) { + RecentFiles.Remove(filepath); + } + RecentFiles.Insert(0, filepath); + if(RecentFiles.Count > Configuration.MaxRecentFiles) { + RecentFiles.RemoveAt(Configuration.MaxRecentFiles); + } + ConfigManager.ApplyChanges(); + } + + public static Configuration Deserialize(string configFile) + { + XmlSerializer xmlSerializer = new XmlSerializer(typeof(Configuration)); + using(TextReader textReader = new StreamReader(configFile)) { + return (Configuration)xmlSerializer.Deserialize(textReader); + } + } + + public void Serialize(string configFile) + { + XmlSerializer xmlSerializer = new XmlSerializer(typeof(Configuration)); + using(TextWriter textWriter = new StreamWriter(configFile)) { + xmlSerializer.Serialize(textWriter, this); + } + } + + public Configuration Clone() + { + XmlSerializer xmlSerializer = new XmlSerializer(typeof(Configuration)); + StringWriter stringWriter = new StringWriter(); + xmlSerializer.Serialize(stringWriter, this); + + StringReader stringReader = new StringReader(stringWriter.ToString()); + return (Configuration)xmlSerializer.Deserialize(stringReader); + } + } + +} diff --git a/GUI.NET/Config/ImageExtensions.cs b/GUI.NET/Config/ImageExtensions.cs new file mode 100644 index 00000000..4ec32192 --- /dev/null +++ b/GUI.NET/Config/ImageExtensions.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Drawing.Imaging; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mesen.GUI.Config +{ + public static class ImageExtensions + { + public static byte[] ToByteArray(this Image image, ImageFormat format) + { + using(MemoryStream ms = new MemoryStream()) { + image.Save(ms, format); + return ms.ToArray(); + } + } + + public static Image ResizeImage(this Image image, int width, int height) + { + var destRect = new Rectangle(0, 0, width, height); + var destImage = new Bitmap(width, height); + + destImage.SetResolution(image.HorizontalResolution, image.VerticalResolution); + + using(var graphics = Graphics.FromImage(destImage)) { + graphics.CompositingMode = CompositingMode.SourceCopy; + graphics.CompositingQuality = CompositingQuality.HighQuality; + graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; + graphics.SmoothingMode = SmoothingMode.HighQuality; + graphics.PixelOffsetMode = PixelOffsetMode.HighQuality; + + using(var wrapMode = new ImageAttributes()) { + wrapMode.SetWrapMode(WrapMode.TileFlipXY); + graphics.DrawImage(image, destRect, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel, wrapMode); + } + } + + return destImage; + } + } +} diff --git a/GUI.NET/Config/PlayerProfile.cs b/GUI.NET/Config/PlayerProfile.cs new file mode 100644 index 00000000..7906d99c --- /dev/null +++ b/GUI.NET/Config/PlayerProfile.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mesen.GUI.Config +{ + public class PlayerProfile + { + public string PlayerName = "NewPlayer"; + public byte[] PlayerAvatar; + + public PlayerProfile() + { + SetAvatar(Properties.Resources.MesenLogo); + } + + + public void SetAvatar(Image image) + { + PlayerAvatar = image.ResizeImage(64, 64).ToByteArray(ImageFormat.Bmp); + } + + public void SetAvatar(string filename) + { + PlayerAvatar = File.ReadAllBytes(filename); + } + + public Image GetAvatarImage() + { + return Image.FromStream(new MemoryStream(PlayerAvatar)); + } + } +} diff --git a/GUI.NET/Config/ServerInfo.cs b/GUI.NET/Config/ServerInfo.cs new file mode 100644 index 00000000..23be52fa --- /dev/null +++ b/GUI.NET/Config/ServerInfo.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mesen.GUI.Config +{ + public class ServerInfo + { + public string Name = "Default"; + public UInt16 Port = 8888; + public string Password = null; + public int MaxPlayers = 4; + public bool AllowSpectators = true; + public bool PublicServer = false; + } +} diff --git a/GUI.NET/ConfigManager/ConfigManager.cs b/GUI.NET/ConfigManager/ConfigManager.cs deleted file mode 100644 index 37e583ef..00000000 --- a/GUI.NET/ConfigManager/ConfigManager.cs +++ /dev/null @@ -1,205 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.IO; -using System.Xml.Serialization; -using System.Drawing; -using System.Drawing.Imaging; -using System.Drawing.Drawing2D; - -namespace Mesen.GUI -{ - class ConfigManager - { - private static Configuration _config; - private static Configuration _dirtyConfig; - - private static void LoadConfig() - { - if(_config == null) { - if(File.Exists(ConfigFile)) { - _config = Configuration.Deserialize(ConfigFile); - _dirtyConfig = Configuration.Deserialize(ConfigFile); - } else { - //Create new config file and save it to disk - _config = new Configuration(); - _dirtyConfig = new Configuration(); - SaveConfig(); - } - } - } - - private static void SaveConfig() - { - _config.Serialize(ConfigFile); - } - - private static string ConfigFile - { - get - { - string configPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData, Environment.SpecialFolderOption.Create), "Mesen"); - if(!Directory.Exists(configPath)) { - Directory.CreateDirectory(configPath); - } - - return Path.Combine(configPath, "settings.xml"); - } - } - - public static Configuration Config - { - get - { - LoadConfig(); - return _dirtyConfig; - } - } - - public static void ApplyChanges() - { - _config = _dirtyConfig.Clone(); - SaveConfig(); - } - - public static void RejectChanges() - { - _dirtyConfig = _config.Clone(); - } - } - - public class PlayerProfile - { - public string PlayerName = "NewPlayer"; - public byte[] PlayerAvatar; - - public PlayerProfile() - { - SetAvatar(Properties.Resources.MesenLogo); - } - - - public void SetAvatar(Image image) - { - PlayerAvatar = image.ResizeImage(64, 64).ToByteArray(ImageFormat.Bmp); - } - - public void SetAvatar(string filename) - { - PlayerAvatar = File.ReadAllBytes(filename); - } - - public Image GetAvatarImage() - { - return Image.FromStream(new MemoryStream(PlayerAvatar)); - } - } - - public class ClientConnectionInfo - { - public string Host = "localhost"; - public UInt16 Port = 8888; - } - - public class ServerInfo - { - public string Name = "Default"; - public UInt16 Port = 8888; - public string Password = null; - public int MaxPlayers = 4; - public bool AllowSpectators = true; - public bool PublicServer = false; - } - - public class Configuration - { - private const int MaxRecentFiles = 10; - - public PlayerProfile Profile; - public ClientConnectionInfo ClientConnectionInfo; - public ServerInfo ServerInfo; - public List RecentFiles; - - public Configuration() - { - Profile = new PlayerProfile(); - ClientConnectionInfo = new ClientConnectionInfo(); - ServerInfo = new ServerInfo(); - RecentFiles = new List(); - } - - public void AddRecentFile(string filepath) - { - if(RecentFiles.Contains(filepath)) { - RecentFiles.Remove(filepath); - } - RecentFiles.Insert(0, filepath); - if(RecentFiles.Count > Configuration.MaxRecentFiles) { - RecentFiles.RemoveAt(Configuration.MaxRecentFiles); - } - ConfigManager.ApplyChanges(); - } - - public static Configuration Deserialize(string configFile) - { - XmlSerializer xmlSerializer = new XmlSerializer(typeof(Configuration)); - using(TextReader textReader = new StreamReader(configFile)) { - return (Configuration)xmlSerializer.Deserialize(textReader); - } - } - - public void Serialize(string configFile) - { - XmlSerializer xmlSerializer = new XmlSerializer(typeof(Configuration)); - using(TextWriter textWriter = new StreamWriter(configFile)) { - xmlSerializer.Serialize(textWriter, this); - } - } - - public Configuration Clone() - { - XmlSerializer xmlSerializer = new XmlSerializer(typeof(Configuration)); - StringWriter stringWriter = new StringWriter(); - xmlSerializer.Serialize(stringWriter, this); - - StringReader stringReader = new StringReader(stringWriter.ToString()); - return (Configuration)xmlSerializer.Deserialize(stringReader); - } - } - - public static class ImageExtensions - { - public static byte[] ToByteArray(this Image image, ImageFormat format) - { - using(MemoryStream ms = new MemoryStream()) { - image.Save(ms, format); - return ms.ToArray(); - } - } - - public static Image ResizeImage(this Image image, int width, int height) - { - var destRect = new Rectangle(0, 0, width, height); - var destImage = new Bitmap(width, height); - - destImage.SetResolution(image.HorizontalResolution, image.VerticalResolution); - - using(var graphics = Graphics.FromImage(destImage)) { - graphics.CompositingMode = CompositingMode.SourceCopy; - graphics.CompositingQuality = CompositingQuality.HighQuality; - graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; - graphics.SmoothingMode = SmoothingMode.HighQuality; - graphics.PixelOffsetMode = PixelOffsetMode.HighQuality; - - using(var wrapMode = new ImageAttributes()) { - wrapMode.SetWrapMode(WrapMode.TileFlipXY); - graphics.DrawImage(image, destRect, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel, wrapMode); - } - } - - return destImage; - } - } -} diff --git a/GUI.NET/Controls/MyListView.cs b/GUI.NET/Controls/MyListView.cs new file mode 100644 index 00000000..b8c597c5 --- /dev/null +++ b/GUI.NET/Controls/MyListView.cs @@ -0,0 +1,99 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Mesen.GUI.Controls +{ + //Code adapted from: + //http://blogs.msdn.com/b/hippietim/archive/2006/03/27/562256.aspx + class MyListView : ListView + { + private bool m_doubleClickDoesCheck = true; // maintain the default behavior + private bool m_inDoubleClickCheckHack = false; + + //**************************************************************************************** + // This function helps us overcome the problem with the managed listview wrapper wanting + // to turn double-clicks on checklist items into checkbox clicks. We count on the fact + // that the base handler for NM_DBLCLK will send a hit test request back at us right away. + // So we set a special flag to return a bogus hit test result in that case. + //**************************************************************************************** + private void OnWmReflectNotify(ref Message m) + { + if(!DoubleClickDoesCheck && CheckBoxes) { + NativeMethods.NMHDR nmhdr = (NativeMethods.NMHDR)Marshal.PtrToStructure(m.LParam, typeof(NativeMethods.NMHDR)); + + if(nmhdr.code == NativeMethods.NM_DBLCLK) { + m_inDoubleClickCheckHack = true; + } + } + } + + protected override void WndProc(ref Message m) + { + switch(m.Msg) { + // This code is to hack around the fact that the managed listview + // wrapper translates double clicks into checks without giving the + // host to participate. + // See OnWmReflectNotify() for more details. + case NativeMethods.WM_REFLECT + NativeMethods.WM_NOTIFY: + OnWmReflectNotify(ref m); + break; + + // This code checks to see if we have entered our hack check for + // double clicking items in check lists. During the NM_DBLCLK + // processing, the managed handler will send a hit test message + // to see which item to check. Returning -1 will convince that + // code not to proceed. + case NativeMethods.LVM_HITTEST: + if(m_inDoubleClickCheckHack) { + m_inDoubleClickCheckHack = false; + m.Result = (System.IntPtr)(-1); + return; + } + break; + } + + base.WndProc(ref m); + } + + [Browsable(true), + Description("When CheckBoxes is true, this controls whether or not double clicking will toggle the check."), + Category("My Controls"), + DefaultValue(true)] + public bool DoubleClickDoesCheck + { + get + { + return m_doubleClickDoesCheck; + } + + set + { + m_doubleClickDoesCheck = value; + } + } + } + + public class NativeMethods + { + public const int WM_USER = 0x0400; + public const int WM_REFLECT = WM_USER + 0x1C00; + public const int WM_NOTIFY = 0x004E; + public const int LVM_HITTEST = (0x1000 + 18); + public const int NM_DBLCLK = (-3); + + [StructLayout(LayoutKind.Sequential)] + public struct NMHDR + { + public IntPtr hwndFrom; + public UIntPtr idFrom; + public int code; + } + } + +} diff --git a/GUI.NET/Debugger/Controls/ctrlConsoleStatus.cs b/GUI.NET/Debugger/Controls/ctrlConsoleStatus.cs index a3af3a8a..7831ec9b 100644 --- a/GUI.NET/Debugger/Controls/ctrlConsoleStatus.cs +++ b/GUI.NET/Debugger/Controls/ctrlConsoleStatus.cs @@ -20,12 +20,12 @@ namespace Mesen.GUI.Debugger private void UpdateCPUStatus(ref DebugState state) { - txtA.Text = state.CPU.A.ToString("x").ToUpper(); - txtX.Text = state.CPU.X.ToString("x").ToUpper(); - txtY.Text = state.CPU.Y.ToString("x").ToUpper(); - txtPC.Text = state.CPU.PC.ToString("x").ToUpper(); - txtSP.Text = state.CPU.SP.ToString("x").ToUpper(); - txtStatus.Text = state.CPU.PS.ToString("x").ToUpper(); + txtA.Text = state.CPU.A.ToString("X"); + txtX.Text = state.CPU.X.ToString("X"); + txtY.Text = state.CPU.Y.ToString("X"); + txtPC.Text = state.CPU.PC.ToString("X"); + txtSP.Text = state.CPU.SP.ToString("X"); + txtStatus.Text = state.CPU.PS.ToString("X"); PSFlags flags = (PSFlags)state.CPU.PS; chkBreak.Checked = flags.HasFlag(PSFlags.Break); @@ -62,20 +62,20 @@ namespace Mesen.GUI.Debugger chkIntensifyGreen.Checked = Convert.ToBoolean(state.PPU.ControlFlags.IntensifyGreen); chkIntensifyBlue.Checked = Convert.ToBoolean(state.PPU.ControlFlags.IntensifyBlue); - txtBGAddr.Text = state.PPU.ControlFlags.BackgroundPatternAddr.ToString("x").ToUpper(); - txtSprAddr.Text = state.PPU.ControlFlags.SpritePatternAddr.ToString("x").ToUpper(); + txtBGAddr.Text = state.PPU.ControlFlags.BackgroundPatternAddr.ToString("X"); + txtSprAddr.Text = state.PPU.ControlFlags.SpritePatternAddr.ToString("X"); - txtVRAMAddr.Text = state.PPU.State.VideoRamAddr.ToString("x").ToUpper(); + txtVRAMAddr.Text = state.PPU.State.VideoRamAddr.ToString("X"); txtCycle.Text = state.PPU.Cycle.ToString(); txtScanline.Text = state.PPU.Scanline.ToString(); - txtNTAddr.Text = (0x2000 | (state.PPU.State.VideoRamAddr & 0x0FFF)).ToString("x").ToUpper(); + txtNTAddr.Text = (0x2000 | (state.PPU.State.VideoRamAddr & 0x0FFF)).ToString("X"); } private void UpdateStack(UInt16 stackPointer) { lstStack.Items.Clear(); for(UInt32 i = (UInt32)0x100 + stackPointer; i < 0x200; i++) { - lstStack.Items.Add("$" + InteropEmu.DebugGetMemoryValue(i).ToString("x").ToUpper()); + lstStack.Items.Add("$" + InteropEmu.DebugGetMemoryValue(i).ToString("X")); } } diff --git a/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs b/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs index ec99d11f..4bd52c64 100644 --- a/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs +++ b/GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs @@ -138,7 +138,7 @@ namespace Mesen.GUI.Debugger codeString.AppendLine("[code not disassembled]"); UInt32 previousAddress = lineParts[0].Length > 0 ? ParseHexAddress(lineParts[0])-1 : 0xFFFF; - lineNumbers.AppendLine(previousAddress.ToString("x").ToUpper()); + lineNumbers.AppendLine(previousAddress.ToString("X")); codeString.AppendLine("[code not disassembled]"); skippingCode = false; @@ -221,7 +221,7 @@ namespace Mesen.GUI.Debugger if(word.StartsWith("$")) { UInt32 address = UInt32.Parse(word.Substring(1), System.Globalization.NumberStyles.AllowHexSpecifier); Byte memoryValue = InteropEmu.DebugGetMemoryValue(address); - string valueText = "$" + memoryValue.ToString("x").ToUpper(); + string valueText = "$" + memoryValue.ToString("X"); toolTip.Show(valueText, txtCode, e.Location.X + 5, e.Location.Y + 5, 3000); } _previousLocation = e.Location; diff --git a/GUI.NET/Debugger/Controls/ctrlWatch.cs b/GUI.NET/Debugger/Controls/ctrlWatch.cs index cec49b94..c28fb27a 100644 --- a/GUI.NET/Debugger/Controls/ctrlWatch.cs +++ b/GUI.NET/Debugger/Controls/ctrlWatch.cs @@ -75,7 +75,7 @@ namespace Mesen.GUI.Debugger string newValue; Byte memoryValue = InteropEmu.DebugGetMemoryValue((UInt32)item.Tag); if(mnuHexDisplay.Checked) { - newValue = "$" + memoryValue.ToString("x").ToUpper(); + newValue = "$" + memoryValue.ToString("X"); } else { newValue = memoryValue.ToString(); } diff --git a/GUI.NET/Debugger/frmDebugger.Designer.cs b/GUI.NET/Debugger/frmDebugger.Designer.cs index 2c2ff4b9..8511743b 100644 --- a/GUI.NET/Debugger/frmDebugger.Designer.cs +++ b/GUI.NET/Debugger/frmDebugger.Designer.cs @@ -32,12 +32,14 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmDebugger)); this.splitContainer = new System.Windows.Forms.SplitContainer(); this.tlpTop = new System.Windows.Forms.TableLayoutPanel(); + this.ctrlDebuggerCode = new Mesen.GUI.Debugger.ctrlDebuggerCode(); this.contextMenuCode = new System.Windows.Forms.ContextMenuStrip(this.components); this.mnuShowNextStatement = new System.Windows.Forms.ToolStripMenuItem(); this.mnuSetNextStatement = new System.Windows.Forms.ToolStripMenuItem(); + this.ctrlConsoleStatus = new Mesen.GUI.Debugger.ctrlConsoleStatus(); + this.ctrlDebuggerCodeSplit = new Mesen.GUI.Debugger.ctrlDebuggerCode(); this.tableLayoutPanel10 = new System.Windows.Forms.TableLayoutPanel(); this.grpBreakpoints = new System.Windows.Forms.GroupBox(); this.lstBreakpoints = new System.Windows.Forms.ListView(); @@ -48,8 +50,12 @@ this.mnuDisableBreakpoint = new System.Windows.Forms.ToolStripMenuItem(); this.mnuAddBreakpoint = new System.Windows.Forms.ToolStripMenuItem(); this.grpWatch = new System.Windows.Forms.GroupBox(); + this.ctrlWatch = new Mesen.GUI.Debugger.ctrlWatch(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuClose = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuView = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuSplitView = new System.Windows.Forms.ToolStripMenuItem(); this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mnuContinue = new System.Windows.Forms.ToolStripMenuItem(); this.mnuBreak = new System.Windows.Forms.ToolStripMenuItem(); @@ -65,13 +71,6 @@ this.mnuFindNext = new System.Windows.Forms.ToolStripMenuItem(); this.mnuFindPrev = new System.Windows.Forms.ToolStripMenuItem(); this.mnuGoTo = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuClose = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuView = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuSplitView = new System.Windows.Forms.ToolStripMenuItem(); - this.ctrlDebuggerCode = new Mesen.GUI.Debugger.ctrlDebuggerCode(); - this.ctrlConsoleStatus = new Mesen.GUI.Debugger.ctrlConsoleStatus(); - this.ctrlDebuggerCodeSplit = new Mesen.GUI.Debugger.ctrlDebuggerCode(); - this.ctrlWatch = new Mesen.GUI.Debugger.ctrlWatch(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); @@ -123,6 +122,17 @@ this.tlpTop.Size = new System.Drawing.Size(984, 422); this.tlpTop.TabIndex = 2; // + // ctrlDebuggerCode + // + this.ctrlDebuggerCode.Code = null; + this.ctrlDebuggerCode.ContextMenuStrip = this.contextMenuCode; + this.ctrlDebuggerCode.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlDebuggerCode.Location = new System.Drawing.Point(3, 3); + this.ctrlDebuggerCode.Name = "ctrlDebuggerCode"; + this.ctrlDebuggerCode.Size = new System.Drawing.Size(270, 416); + this.ctrlDebuggerCode.TabIndex = 2; + this.ctrlDebuggerCode.OnWatchAdded += new Mesen.GUI.Debugger.ctrlDebuggerCode.WatchAddedEventHandler(this.ctrlDebuggerCode_OnWatchAdded); + // // contextMenuCode // this.contextMenuCode.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -147,6 +157,24 @@ this.mnuSetNextStatement.Size = new System.Drawing.Size(258, 22); this.mnuSetNextStatement.Text = "Set Next Statement"; // + // ctrlConsoleStatus + // + this.ctrlConsoleStatus.Dock = System.Windows.Forms.DockStyle.Top; + this.ctrlConsoleStatus.Location = new System.Drawing.Point(552, 0); + this.ctrlConsoleStatus.Margin = new System.Windows.Forms.Padding(0); + this.ctrlConsoleStatus.Name = "ctrlConsoleStatus"; + this.ctrlConsoleStatus.Size = new System.Drawing.Size(432, 362); + this.ctrlConsoleStatus.TabIndex = 3; + // + // ctrlDebuggerCodeSplit + // + this.ctrlDebuggerCodeSplit.Code = null; + this.ctrlDebuggerCodeSplit.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(279, 3); + this.ctrlDebuggerCodeSplit.Name = "ctrlDebuggerCodeSplit"; + this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(270, 416); + this.ctrlDebuggerCodeSplit.TabIndex = 4; + // // tableLayoutPanel10 // this.tableLayoutPanel10.ColumnCount = 2; @@ -159,8 +187,8 @@ this.tableLayoutPanel10.Name = "tableLayoutPanel10"; this.tableLayoutPanel10.RowCount = 1; this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 195F)); - this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 195F)); + this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 162F)); + this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 162F)); this.tableLayoutPanel10.Size = new System.Drawing.Size(984, 162); this.tableLayoutPanel10.TabIndex = 0; // @@ -245,6 +273,14 @@ this.grpWatch.TabStop = false; this.grpWatch.Text = "Watch"; // + // ctrlWatch + // + this.ctrlWatch.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlWatch.Location = new System.Drawing.Point(3, 16); + this.ctrlWatch.Name = "ctrlWatch"; + this.ctrlWatch.Size = new System.Drawing.Size(480, 137); + this.ctrlWatch.TabIndex = 0; + // // menuStrip // this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -266,6 +302,28 @@ this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "File"; // + // mnuClose + // + this.mnuClose.Name = "mnuClose"; + this.mnuClose.Size = new System.Drawing.Size(103, 22); + this.mnuClose.Text = "Close"; + // + // mnuView + // + this.mnuView.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuSplitView}); + this.mnuView.Name = "mnuView"; + this.mnuView.Size = new System.Drawing.Size(44, 20); + this.mnuView.Text = "View"; + // + // mnuSplitView + // + this.mnuSplitView.CheckOnClick = true; + this.mnuSplitView.Name = "mnuSplitView"; + this.mnuSplitView.Size = new System.Drawing.Size(125, 22); + this.mnuSplitView.Text = "Split View"; + this.mnuSplitView.Click += new System.EventHandler(this.mnuSplitView_Click); + // // debugToolStripMenuItem // this.debugToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -390,63 +448,6 @@ this.mnuGoTo.Size = new System.Drawing.Size(196, 22); this.mnuGoTo.Text = "Go to..."; // - // mnuClose - // - this.mnuClose.Name = "mnuClose"; - this.mnuClose.Size = new System.Drawing.Size(103, 22); - this.mnuClose.Text = "Close"; - // - // mnuView - // - this.mnuView.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnuSplitView}); - this.mnuView.Name = "mnuView"; - this.mnuView.Size = new System.Drawing.Size(44, 20); - this.mnuView.Text = "View"; - // - // mnuSplitView - // - this.mnuSplitView.CheckOnClick = true; - this.mnuSplitView.Name = "mnuSplitView"; - this.mnuSplitView.Size = new System.Drawing.Size(125, 22); - this.mnuSplitView.Text = "Split View"; - this.mnuSplitView.Click += new System.EventHandler(this.mnuSplitView_Click); - // - // ctrlDebuggerCode - // - this.ctrlDebuggerCode.ContextMenuStrip = this.contextMenuCode; - this.ctrlDebuggerCode.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlDebuggerCode.Location = new System.Drawing.Point(3, 3); - this.ctrlDebuggerCode.Name = "ctrlDebuggerCode"; - this.ctrlDebuggerCode.Size = new System.Drawing.Size(270, 416); - this.ctrlDebuggerCode.TabIndex = 2; - this.ctrlDebuggerCode.OnWatchAdded += new Mesen.GUI.Debugger.ctrlDebuggerCode.WatchAddedEventHandler(this.ctrlDebuggerCode_OnWatchAdded); - // - // ctrlConsoleStatus - // - this.ctrlConsoleStatus.Dock = System.Windows.Forms.DockStyle.Top; - this.ctrlConsoleStatus.Location = new System.Drawing.Point(552, 0); - this.ctrlConsoleStatus.Margin = new System.Windows.Forms.Padding(0); - this.ctrlConsoleStatus.Name = "ctrlConsoleStatus"; - this.ctrlConsoleStatus.Size = new System.Drawing.Size(432, 362); - this.ctrlConsoleStatus.TabIndex = 3; - // - // ctrlDebuggerCodeSplit - // - this.ctrlDebuggerCodeSplit.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(279, 3); - this.ctrlDebuggerCodeSplit.Name = "ctrlDebuggerCodeSplit"; - this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(270, 416); - this.ctrlDebuggerCodeSplit.TabIndex = 4; - // - // ctrlWatch - // - this.ctrlWatch.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlWatch.Location = new System.Drawing.Point(3, 16); - this.ctrlWatch.Name = "ctrlWatch"; - this.ctrlWatch.Size = new System.Drawing.Size(480, 137); - this.ctrlWatch.TabIndex = 0; - // // frmDebugger // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -454,7 +455,6 @@ this.ClientSize = new System.Drawing.Size(984, 612); this.Controls.Add(this.splitContainer); this.Controls.Add(this.menuStrip); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip; this.MinimumSize = new System.Drawing.Size(1000, 650); this.Name = "frmDebugger"; diff --git a/GUI.NET/Debugger/frmDebugger.cs b/GUI.NET/Debugger/frmDebugger.cs index 11b16692..bebd8a8b 100644 --- a/GUI.NET/Debugger/frmDebugger.cs +++ b/GUI.NET/Debugger/frmDebugger.cs @@ -25,6 +25,8 @@ namespace Mesen.GUI.Debugger { base.OnLoad(e); + Icon = Properties.Resources.MesenIcon; + _notifListener = new InteropEmu.NotificationListener(); _notifListener.OnNotification += _notifListener_OnNotification; diff --git a/GUI.NET/Debugger/frmDebugger.resx b/GUI.NET/Debugger/frmDebugger.resx index 8f769556..0e14e7e9 100644 --- a/GUI.NET/Debugger/frmDebugger.resx +++ b/GUI.NET/Debugger/frmDebugger.resx @@ -126,293 +126,4 @@ 107, 17 - - - - AAABAAMAEBAAAAAAGABoAwAANgAAACAgAAAAABgAqAwAAJ4DAABAQAAAAAAYACgyAABGEAAAKAAAABAA - AAAgAAAAAQAYAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAANPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT0/////////////////////////7+/v7+/v///////////////////////9PT09PT - 0////////////+np6cHBwaamppubm5qamqWlpb6+vuTk5P///////////9PT09PT0/////j4+Ly8vJqa - mpqamq2trb6+vr6+vq6urpubm5qamrW1tfT09P///9PT09PT0/b29qqqqpqamry8vPDw8Pz8/Ofn5+fn - 5/z8/PPz88PDw5ubm6WlpfLy8tPT09PT07a2tpqamtbW1v///+Li4qKiopqampqamqKiouLi4v///9/f - 35ubm7Ozs9PT09PT06WlpcPDw/////T09J6enp6enqmpqZqampqamp6envT09P///8XFxaWlpdPT09PT - 0/f5/f7+/////9jY2JqamsTExO3t7ZqampqampqamtjY2P////7+//f5/dPT09PT0xxv/22i/////93d - 3ZqamsbGxu/v75qampqampqamt3d3f///2mg/xxv/9PT09PT00CG/wRg/67L//v7+6mpqbq6uuHh4Zqa - mpqamqmpqfv7+5e9/wFf/0eL/9PT09PT093q/xtv/wJf/2mg/9ji9b29vaCgoKCgoL29vc/d9FeV/wBe - /yh3/+jw/9PT09PT0////+Pt/0SJ/wBe/wJf/zR//1uX/1qX/zF8/wFf/wBe/1eV/+70/////9PT09PT - 0////////////7zU/1yY/x1w/wFf/wFf/x9x/2Kc/8jc/////////////9PT09PT0/////////////// - //////////z9//z9/////////////////////////9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT0///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAIAAAAEAAAAABABgAAAAAAAAMAAAAAAAAAAAAAAAA - AAAAAAAA09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT//////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////09PT09PT//////////////////////////////////////////////////// - ////////////////////////////////////////////////////////////////////09PT09PT//// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - /Pz84eHhycnJtra2qqqqpKSkpKSkqqqqtra2x8fH3t7e+fn5//////////////////////////////// - ////09PT09PT////////////////////////////7u7uwcHBn5+fmpqampqampqampqampqampqampqa - mpqampqampqanJycubm54+Pj////////////////////////////09PT09PT//////////////////// - 8/Pzvb29m5ubmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqasLCw6Ojo - ////////////////////09PT09PT////////////////2NjYn5+fmpqampqampqampqampqampqapqam - tbW1vb29vb29tbW1p6enmpqampqampqampqampqampqam5ubxcXF/Pz8////////////09PT09PT//// - /////f39wcHBmpqampqampqampqampqarKys1NTU8/Pz////////////////////////9vb22tratbW1 - mpqampqampqampqampqasLCw9vb2////////09PT09PT/////f39ubm5mpqampqampqampqaqqqq4eHh - ////////////////////////////////////////////////7e3tt7e3mpqampqampqampqaq6ur9/f3 - ////09PT09PT////wcHBmpqampqampqampqayMjI/Pz8////////////7e3txMTEqqqqnZ2dnZ2dqqqq - xMTE7e3t////////////////29vbn5+fmpqampqampqatLS0/v7+09PT09PT3t7empqampqampqanJyc - 3Nzc/////////////f39xsbGm5ubmpqampqampqampqampqampqam5ubxsbG/f39////////////7Ozs - o6Ojmpqampqampqa1tbW09PT09PTrKysmpqampqampqa3d3d/////////////v7+u7u7mpqampqampqa - mpqampqampqampqampqampqampqau7u7/v7+////////////6urqnZ2dmpqampqaqqqq09PT09PTnZ2d - mpqampqawcHB////////////////1dXVmpqampqampqampqampqampqampqampqampqampqampqampqa - 1dXV////////////////xcXFmpqampqanZ2d09PT09PTz8/Pm5ubqKio8/Pz/////////////v7+pKSk - mpqampqampqavLy819fXpaWlmpqampqampqampqampqampqapaWl/v7+////////////8/PzqKiom5ub - 0NDQ09PT09PT/////Pz8/v7+////////////////6+vrmpqampqampqanp6e/f39////19fXmpqampqa - mpqampqampqampqampqa6+vr/////////////////v7+/Pz8////09PT09PT////+Pr//v7///////// - ////////3t7empqampqampqaoqKi////////3d3dmpqampqampqampqampqampqampqa3t7e//////// - /////////v7/+Pr/////09PT09PTiLP/BWD/JXT/4ez/////////////4uLimpqampqampqaoqKi//// - ////3d3dmpqampqampqampqampqampqampqa4uLi////////////4ez/JXT/BWD/ibP/09PT09PTCmT/ - AF7/AF7/b6P/////////////9vb2m5ubmpqampqaoqKi////////3d3dmpqampqampqampqampqampqa - m5ub9vb2////////////Y5z/AF7/AF7/CmT/09PT09PTKnj/AF7/AF7/B2L/zN7/////////////ubm5 - mpqampqaoqKi////////3d3dmpqampqampqampqampqampqauLi4////////////qsj/AV//AF7/AF7/ - Lnr/09PT09PTmr7/AF7/AF7/AF7/F2z/0eH/////////8PDwn5+fmpqam5ub8fHx////yMjImpqampqa - mpqampqampqan5+f8PDw////////qMf/BmH/AF7/AF7/AF7/rcv/09PT09PT/f3/Qof/AF7/AF7/AF7/ - DWb/pcX/////////5eXloKCgmpqaoaGhsbGxmpqampqampqampqampqaoKCg5eXl////+fv/dqf/AV// - AF7/AF7/AF7/ZJz/////09PT09PT////7PL/Knj/AF7/AF7/AF7/AF7/Soz/0uL/////8fHxurq6m5ub - mpqampqampqampqam5uburq68fHx////tM//KXf/AF7/AF7/AF7/AF7/UI//+vz/////09PT09PT//// - ////6vH/OIH/AF7/AF7/AF7/AF7/AV//RYn/osP/6vH/9PT02trazs7Ozs7O2tra9PT04uz/k7r/L3v/ - AF7/AF7/AF7/AF7/AF7/ZJz/+vz/////////09PT09PT////////////+Pr/bqP/Al//AF7/AF7/AF7/ - AF7/AF7/AV7/InP/Ror/WJX/WZX/RYn/HnD/AF7/AF7/AF7/AF7/AF7/AF7/DWb/ncH///////////// - ////09PT09PT////////////////////xtr/OIH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/Al//WZb/4u3/////////////////////09PT09PT//////////////////// - ////////utP/UJD/BmH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/DWb/ZZ3/1OP///////// - ////////////////////09PT09PT////////////////////////////////////8PX/rMr/cqX/R4r/ - Knj/G27/G27/Knj/SYv/d6n/ttD/9vn/////////////////////////////////////09PT09PT//// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////09PT09PT//////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAQAAAAIAAAAABABgAAAAAAAAwAAAAAAAAAAAAAAAA - AAAAAAAA09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT//////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////09PT09PT//////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////////////////////09PT09PT//// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////09PT09PT//////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////09PT09PT//////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - ////////////////////////////////////////////////////////////+vr66Ojo2dnZzc3NxMTE - v7+/vLy8vLy8v7+/xcXFzc3N2NjY5ubm+Pj4//////////////////////////////////////////// - ////////////////////////////////////////////////////09PT09PT//////////////////// - ////////////////////////////////////////////////////////////+fn53d3dwsLCqqqqmpqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqapaWlvLy81dXV8vLy//////////// - ////////////////////////////////////////////////////////////////////09PT09PT//// - /////////////////////////////////////////////////////////////////Pz83Nzct7e3nJyc - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqaq6urzc3N8/Pz//////////////////////////////////////////////////////////////// - ////09PT09PT////////////////////////////////////////////////////////////9fX1ysrK - oqKimpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqam5ubtra24uLi//////////////////////////////////////// - ////////////////////09PT09PT//////////////////////////////////////////////////// - 9vb2xcXFnZ2dmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqara2t4ODg//////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - /////////f39z8/Pn5+fmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - sbGx6+vr////////////////////////////////////////////09PT09PT//////////////////// - ////////////////////6Ojoqqqqmpqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqam5ubxsbG+/v7////////////////////////////////////09PT09PT//// - /////////////////////////////f39ysrKm5ubmpqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqaoqKirq6utbW1uLi4uLi4tbW1rq6uo6Ojmpqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqaqKio6urq//////////////////////////// - ////09PT09PT////////////////////////////9fX1sbGxmpqampqampqampqampqampqampqampqa - mpqampqampqampqampqanJyctLS0z8/P5eXl+fn5////////////////////////////////+/v76enp - 1NTUvLy8oaGhmpqampqampqampqampqampqampqampqampqampqampqampqampqanJyc1tbW//////// - ////////////////////09PT09PT////////////////////////6+vrpKSkmpqampqampqampqampqa - mpqampqampqampqampqampqampqasrKy2NjY+fn5//////////////////////////////////////// - /////////////////////////v7+5eXlwsLCn5+fmpqampqampqampqampqampqampqampqampqampqa - mpqampqaxcXF/v7+////////////////////09PT09PT////////////////////5OTkn5+fmpqampqa - mpqampqampqampqampqampqampqampqam5ubvr6+7Ozs//////////////////////////////////// - ////////////////////////////////////////////////////+vr61NTUpqammpqampqampqampqa - mpqampqampqampqampqampqampqavb29/v7+////////////////09PT09PT////////////////4+Pj - nZ2dmpqampqampqampqampqampqampqampqampqampqauLi47+/v//////////////////////////// - /////////////////////////////////////////////////////////////////////////////f39 - 1dXVoqKimpqampqampqampqampqampqampqampqampqampqavb29/v7+////////////09PT09PT//// - ////////6OjonZ2dmpqampqampqampqampqampqampqampqampqapaWl4eHh//////////////////// - ////////////////////////+/v76enp3d3d19fX19fX3d3d6enp+/v7//////////////////////// - ////////////////////+fn5w8PDmpqampqampqampqampqampqampqampqampqampqaxsbG//////// - ////09PT09PT////////8vLyoaGhmpqampqampqampqampqampqampqampqampqavr6++fn5//////// - ////////////////////////////9vb20NDQsLCwm5ubmpqampqampqampqampqampqam5ubsLCw0NDQ - 9vb2////////////////////////////////////////5OTkpKSkmpqampqampqampqampqampqampqa - mpqampqa29vb////////09PT09PT/////f39rq6umpqampqampqampqampqampqampqampqanJyc19fX - ////////////////////////////////////9/f3xMTEnZ2dmpqampqampqampqampqampqampqampqa - mpqampqampqampqanZ2dxMTE9/f3////////////////////////////////////9vb2sbGxmpqampqa - mpqampqampqampqampqampqan5+f8/Pz////09PT09PT////zMzMmpqampqampqampqampqampqampqa - mpqaoKCg5ubm////////////////////////////////////39/foqKimpqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqaoqKi39/f//////////////////////////////// - /////Pz8urq6mpqampqampqampqampqampqampqampqau7u7////09PT09PT8/PznZ2dmpqampqampqa - mpqampqampqampqaoaGh7Ozs////////////////////////////////////zMzMmpqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqazMzM//////////// - /////////////////////////f39urq6mpqampqampqampqampqampqampqampqa7Ozs09PT09PTx8fH - mpqampqampqampqampqampqampqanp6e6urq////////////////////////////////////ysrKmpqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqaysrK/////////////////////////////////////Pz8sLCwmpqampqampqampqampqampqampqa - w8PD09PT09PTpaWlmpqampqampqampqampqampqampqa3t7e//////////////////////////////// - ////2dnZmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqa2dnZ////////////////////////////////////8/Pzn5+fmpqampqa - mpqampqampqampqapaWl09PT09PTm5ubmpqampqampqampqampqampqav7+///////////////////// - ////////////////8/Pznp6empqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqan5+f8/Pz//////////////////////////////// - ////zc3Nmpqampqampqampqampqampqam5ub09PT09PTrKysmpqampqampqampqampqam5ub8vLy//// - ////////////////////////////////vb29mpqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqavb29//////////////// - ////////////////////8/PzmpqampqampqampqampqampqarKys09PT09PT39/fmpqampqampqampqa - mpqawsLC////////////////////////////////////8fHxmpqampqampqampqampqampqampqampqa - mpqasLCwxcXFrq6umpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqam5ub - 8fHx////////////////////////////////////wsLCmpqampqampqampqampqa39/f09PT09PT//// - 3d3dqKiompqaoKCgysrK/f39////////////////////////////////////zMzMmpqampqampqampqa - mpqampqampqampqazs7O////////////yMjImpqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqazMzM/////////////////////////////////////f39ysrKoKCgmpqaqKio3d3d - ////09PT09PT////////////+/v7/v7+////////////////////////////////////////////r6+v - mpqampqampqampqampqampqampqaqqqq/////////////////f39paWlmpqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqar6+v//////////////////////////////////////////// - /v7++/v7////////////09PT09PT//////////////////////////////////////////////////// - /////////f39nJycmpqampqampqampqampqampqampqavb29////////////////////uLi4mpqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqanJyc/v7+//////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - ////////////////////////9PT0mpqampqampqampqampqampqampqampqavr6+//////////////// - ////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa9PT0//////// - ////////////////////////////////////////////////////09PT09PT////////////+vz//f7/ - ////////////////////////////////////////7+/vmpqampqampqampqampqampqampqampqavr6+ - ////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqa7u7u/////////////////////////////////////////f7/+vz/////////////09PT09PT//// - rMn/J3X/Al7/FGn/fKr/+/z/////////////////////////////////8/Pzmpqampqampqampqampqa - mpqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqa8/Pz////////////////////////////////+/z/e6r/FGn/Al7/KHX/rMn/ - ////09PT09PTsMv/AV7/AF7/AF7/AF7/AF7/aJ7//////////////////////////////////Pz8m5ub - mpqampqampqampqampqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqam5ub/f39////////////////////////////////aJ7/AF7/ - AF7/AF7/AF7/Al//sMz/09PT09PTMHv/AF7/AF7/AF7/AF7/AF7/A1//4+3///////////////////// - ////////////rKysmpqampqampqampqampqampqampqavr6+////////////////////ubm5mpqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqarKys//////////////////////////// - ////3+r/Al7/AF7/AF7/AF7/AF7/AF7/MHv/09PT09PTBGD/AF7/AF7/AF7/AF7/AF7/AF7/hbD///// - ////////////////////////////x8fHmpqampqampqampqampqampqampqavr6+//////////////// - ////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqax8fH//////////// - ////////////////////YZr/AF7/AF7/AF7/AF7/AF7/AF7/BGD/09PT09PTHm//AF7/AF7/AF7/AF7/ - AF7/AF7/D2b/4uz/////////////////////////////7Ozsmpqampqampqampqampqampqampqavr6+ - ////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqa - 7Ozs////////////////////////////rcr/AV7/AF7/AF7/AF7/AF7/AF7/AF7/HnD/09PT09PTaZ// - AF7/AF7/AF7/AF7/AF7/AF7/AF7/OoH/+Pr/////////////////////////////tbW1mpqampqampqa - mpqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqa - mpqampqampqatbW1////////////////////////////zN7/DGX/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - dKX/09PT09PTz+D/AV7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/VZH//P3///////////////////////// - 7e3tm5ubmpqampqampqampqampqauLi4////////////////////srKympqampqampqampqampqampqa - mpqampqampqampqampqampqanJyc7e3t////////////////////////0OD/FGn/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/CWP/4+z/09PT09PT////VJH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/VZH/+fv///// - ////////////////////zs7OmpqampqampqampqampqanZ2d8vLy////////////7e3tm5ubmpqampqa - mpqampqampqampqampqampqampqampqampqampqazs7O////////////////////////wtf/EWj/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/gK3/////09PT09PT////4ez/Dmb/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/PYP/6fD//////////////////////v7+vb29mpqampqampqampqampqaqKio4+Pj+fn54ODg - paWlmpqampqampqampqampqampqampqampqampqampqampqampqavLy8/v7+//////////////////// - nL//B2L/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/NH3/+vv/////09PT09PT////////pcX/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/G27/vtX//////////////////////f39vb29mpqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqavb29/f39//////// - ////////8fb/Xpj/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/3+r/////////09PT09PT//// - ////////c6T/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Al//bKD/8fb///////////////////// - 0NDQnJycmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqanJyc0NDQ - ////////////////////ttD/H3D/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CmT/xtr///////// - ////09PT09PT/////////////f3/WZX/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/GGz/mL3/ - +/z/////////////////7u7utra2mpqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqatra27u7u////////////////2OX/T47/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CWP/ - utL/////////////////09PT09PT////////////////+vz/WZT/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/InL/lbr/9Pj/////////////////6urqwsLCoqKimpqampqampqampqampqampqa - mpqampqaoqKiwsLC6urq////////////////0+L/XZf/BGD/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/DWX/vdT/////////////////////09PT09PT/////////////////////P3/bqL/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/EGf/Z53/wdb//P3//////////////v7+7e3t2tra - zs7OyMjIyMjIzs7O2tra7e3t/v7+////////////8PX/oMH/P4T/AV7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/HG7/z9//////////////////////////09PT09PT//////////////////// - ////////mL3/BmH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/WJT/lrv/ - ytz/9fn/////////////////////////////////8fb/wdb/iLL/RIj/B2L/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/PYP/5+//////////////////////////////09PT09PT//// - ////////////////////////////zN7/JnT/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/Al7/Gm3/NH3/Ron/To7/T47/R4n/NH3/GGz/AV3/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/A1//fKv/+/z///////////////////////////// - ////09PT09PT////////////////////////////////////9Pj/cKP/Al//AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Knf/x9r///////////////////// - ////////////////////09PT09PT////////////////////////////////////////////zd7/PIP/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Dmb/ibP/+fv///////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - /////////////v7/sc3/MXz/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CWP/cKP/6fH/ - ////////////////////////////////////////////////////09PT09PT//////////////////// - /////////////////////////////////////v//uNH/Sov/Al7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/ - e6r/5+//////////////////////////////////////////////////////////////09PT09PT//// - ////////////////////////////////////////////////////////////////4Or/hLD/LXj/AV7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - BmH/TI3/qcf/9/r///////////////////////////////////////////////////////////////// - ////09PT09PT//////////////////////////////////////////////////////////////////// - ////////////3en/l7z/V5P/HW//AV7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - A17/KXb/Zp3/q8n/7/X///////////////////////////////////////////////////////////// - ////////////////////09PT09PT//////////////////////////////////////////////////// - /////////////////////////////////////////v//7PL/wtf/n8H/g6//bqL/YJn/WZT/WJT/X5n/ - bqL/hLD/osP/x9r/8fb///////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////09PT09PT//////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////////////////////09PT09PT//// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////09PT09PT//////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////09PT09PT//////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PTAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - - \ No newline at end of file diff --git a/GUI.NET/Forms/BaseConfigForm.Designer.cs b/GUI.NET/Forms/BaseConfigForm.Designer.cs new file mode 100644 index 00000000..81f15c02 --- /dev/null +++ b/GUI.NET/Forms/BaseConfigForm.Designer.cs @@ -0,0 +1,113 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Mesen.GUI.Forms +{ + partial class BaseConfigForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if(disposing && (components != null)) { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BaseConfigForm)); + this.panel1 = new System.Windows.Forms.Panel(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); + this.panel1.SuspendLayout(); + this.flowLayoutPanel1.SuspendLayout(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.Controls.Add(this.flowLayoutPanel1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel1.Location = new System.Drawing.Point(0, 232); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(284, 30); + this.panel1.TabIndex = 0; + // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.Controls.Add(this.btnCancel); + this.flowLayoutPanel1.Controls.Add(this.btnOK); + this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.Size = new System.Drawing.Size(284, 30); + this.flowLayoutPanel1.TabIndex = 4; + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(206, 3); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.TabIndex = 0; + this.btnCancel.Text = "Cancel"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // btnOK + // + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnOK.Location = new System.Drawing.Point(125, 3); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(75, 23); + this.btnOK.TabIndex = 1; + this.btnOK.Text = "OK"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // BaseConfigForm + // + this.AcceptButton = this.btnOK; + this.CancelButton = this.btnCancel; + this.ClientSize = new System.Drawing.Size(284, 262); + this.Controls.Add(this.panel1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "BaseConfigForm"; + this.panel1.ResumeLayout(false); + this.flowLayoutPanel1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + protected System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; + protected Button btnCancel; + protected Button btnOK; + } +} diff --git a/GUI.NET/Forms/BaseConfigForm.cs b/GUI.NET/Forms/BaseConfigForm.cs index 9b639ef9..f1678a9b 100644 --- a/GUI.NET/Forms/BaseConfigForm.cs +++ b/GUI.NET/Forms/BaseConfigForm.cs @@ -4,24 +4,47 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Mesen.GUI.Config; namespace Mesen.GUI.Forms { - public class BaseConfigForm : Form + public partial class BaseConfigForm : BaseForm { + public BaseConfigForm() + { + InitializeComponent(); + } + protected override void OnFormClosed(FormClosedEventArgs e) { if(this.DialogResult == System.Windows.Forms.DialogResult.OK) { UpdateConfig(); - ConfigManager.ApplyChanges(); + if(ApplyChangesOnOK) { + ConfigManager.ApplyChanges(); + } } else { ConfigManager.RejectChanges(); } base.OnFormClosed(e); } + protected virtual bool ApplyChangesOnOK + { + get { return true; } + } + protected virtual void UpdateConfig() { } + + private void btnOK_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } } } diff --git a/GUI.NET/Forms/BaseConfigForm.resx b/GUI.NET/Forms/BaseConfigForm.resx new file mode 100644 index 00000000..a4c39078 --- /dev/null +++ b/GUI.NET/Forms/BaseConfigForm.resx @@ -0,0 +1,412 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + + + AAABAAMAEBAAAAAAGABoAwAANgAAACAgAAAAABgAqAwAAJ4DAABAQAAAAAAYACgyAABGEAAAKAAAABAA + AAAgAAAAAQAYAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAANPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT0/////////////////////////7+/v7+/v///////////////////////9PT09PT + 0////////////+np6cHBwaamppubm5qamqWlpb6+vuTk5P///////////9PT09PT0/////j4+Ly8vJqa + mpqamq2trb6+vr6+vq6urpubm5qamrW1tfT09P///9PT09PT0/b29qqqqpqamry8vPDw8Pz8/Ofn5+fn + 5/z8/PPz88PDw5ubm6WlpfLy8tPT09PT07a2tpqamtbW1v///+Li4qKiopqampqamqKiouLi4v///9/f + 35ubm7Ozs9PT09PT06WlpcPDw/////T09J6enp6enqmpqZqampqamp6envT09P///8XFxaWlpdPT09PT + 0/f5/f7+/////9jY2JqamsTExO3t7ZqampqampqamtjY2P////7+//f5/dPT09PT0xxv/22i/////93d + 3ZqamsbGxu/v75qampqampqamt3d3f///2mg/xxv/9PT09PT00CG/wRg/67L//v7+6mpqbq6uuHh4Zqa + mpqamqmpqfv7+5e9/wFf/0eL/9PT09PT093q/xtv/wJf/2mg/9ji9b29vaCgoKCgoL29vc/d9FeV/wBe + /yh3/+jw/9PT09PT0////+Pt/0SJ/wBe/wJf/zR//1uX/1qX/zF8/wFf/wBe/1eV/+70/////9PT09PT + 0////////////7zU/1yY/x1w/wFf/wFf/x9x/2Kc/8jc/////////////9PT09PT0/////////////// + //////////z9//z9/////////////////////////9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT0///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAIAAAAEAAAAABABgAAAAAAAAMAAAAAAAAAAAAAAAA + AAAAAAAA09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT//////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////09PT09PT//////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////09PT09PT//// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + /Pz84eHhycnJtra2qqqqpKSkpKSkqqqqtra2x8fH3t7e+fn5//////////////////////////////// + ////09PT09PT////////////////////////////7u7uwcHBn5+fmpqampqampqampqampqampqampqa + mpqampqampqanJycubm54+Pj////////////////////////////09PT09PT//////////////////// + 8/Pzvb29m5ubmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqasLCw6Ojo + ////////////////////09PT09PT////////////////2NjYn5+fmpqampqampqampqampqampqapqam + tbW1vb29vb29tbW1p6enmpqampqampqampqampqampqam5ubxcXF/Pz8////////////09PT09PT//// + /////f39wcHBmpqampqampqampqampqarKys1NTU8/Pz////////////////////////9vb22tratbW1 + mpqampqampqampqampqasLCw9vb2////////09PT09PT/////f39ubm5mpqampqampqampqaqqqq4eHh + ////////////////////////////////////////////////7e3tt7e3mpqampqampqampqaq6ur9/f3 + ////09PT09PT////wcHBmpqampqampqampqayMjI/Pz8////////////7e3txMTEqqqqnZ2dnZ2dqqqq + xMTE7e3t////////////////29vbn5+fmpqampqampqatLS0/v7+09PT09PT3t7empqampqampqanJyc + 3Nzc/////////////f39xsbGm5ubmpqampqampqampqampqampqam5ubxsbG/f39////////////7Ozs + o6Ojmpqampqampqa1tbW09PT09PTrKysmpqampqampqa3d3d/////////////v7+u7u7mpqampqampqa + mpqampqampqampqampqampqampqau7u7/v7+////////////6urqnZ2dmpqampqaqqqq09PT09PTnZ2d + mpqampqawcHB////////////////1dXVmpqampqampqampqampqampqampqampqampqampqampqampqa + 1dXV////////////////xcXFmpqampqanZ2d09PT09PTz8/Pm5ubqKio8/Pz/////////////v7+pKSk + mpqampqampqavLy819fXpaWlmpqampqampqampqampqampqapaWl/v7+////////////8/PzqKiom5ub + 0NDQ09PT09PT/////Pz8/v7+////////////////6+vrmpqampqampqanp6e/f39////19fXmpqampqa + mpqampqampqampqampqa6+vr/////////////////v7+/Pz8////09PT09PT////+Pr//v7///////// + ////////3t7empqampqampqaoqKi////////3d3dmpqampqampqampqampqampqampqa3t7e//////// + /////////v7/+Pr/////09PT09PTiLP/BWD/JXT/4ez/////////////4uLimpqampqampqaoqKi//// + ////3d3dmpqampqampqampqampqampqampqa4uLi////////////4ez/JXT/BWD/ibP/09PT09PTCmT/ + AF7/AF7/b6P/////////////9vb2m5ubmpqampqaoqKi////////3d3dmpqampqampqampqampqampqa + m5ub9vb2////////////Y5z/AF7/AF7/CmT/09PT09PTKnj/AF7/AF7/B2L/zN7/////////////ubm5 + mpqampqaoqKi////////3d3dmpqampqampqampqampqampqauLi4////////////qsj/AV//AF7/AF7/ + Lnr/09PT09PTmr7/AF7/AF7/AF7/F2z/0eH/////////8PDwn5+fmpqam5ub8fHx////yMjImpqampqa + mpqampqampqan5+f8PDw////////qMf/BmH/AF7/AF7/AF7/rcv/09PT09PT/f3/Qof/AF7/AF7/AF7/ + DWb/pcX/////////5eXloKCgmpqaoaGhsbGxmpqampqampqampqampqaoKCg5eXl////+fv/dqf/AV// + AF7/AF7/AF7/ZJz/////09PT09PT////7PL/Knj/AF7/AF7/AF7/AF7/Soz/0uL/////8fHxurq6m5ub + mpqampqampqampqam5uburq68fHx////tM//KXf/AF7/AF7/AF7/AF7/UI//+vz/////09PT09PT//// + ////6vH/OIH/AF7/AF7/AF7/AF7/AV//RYn/osP/6vH/9PT02trazs7Ozs7O2tra9PT04uz/k7r/L3v/ + AF7/AF7/AF7/AF7/AF7/ZJz/+vz/////////09PT09PT////////////+Pr/bqP/Al//AF7/AF7/AF7/ + AF7/AF7/AV7/InP/Ror/WJX/WZX/RYn/HnD/AF7/AF7/AF7/AF7/AF7/AF7/DWb/ncH///////////// + ////09PT09PT////////////////////xtr/OIH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/Al//WZb/4u3/////////////////////09PT09PT//////////////////// + ////////utP/UJD/BmH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/DWb/ZZ3/1OP///////// + ////////////////////09PT09PT////////////////////////////////////8PX/rMr/cqX/R4r/ + Knj/G27/G27/Knj/SYv/d6n/ttD/9vn/////////////////////////////////////09PT09PT//// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////09PT09PT//////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAQAAAAIAAAAABABgAAAAAAAAwAAAAAAAAAAAAAAAA + AAAAAAAA09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT//////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////09PT09PT//////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////09PT09PT//// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////09PT09PT//////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////09PT09PT//////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + ////////////////////////////////////////////////////////////+vr66Ojo2dnZzc3NxMTE + v7+/vLy8vLy8v7+/xcXFzc3N2NjY5ubm+Pj4//////////////////////////////////////////// + ////////////////////////////////////////////////////09PT09PT//////////////////// + ////////////////////////////////////////////////////////////+fn53d3dwsLCqqqqmpqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqapaWlvLy81dXV8vLy//////////// + ////////////////////////////////////////////////////////////////////09PT09PT//// + /////////////////////////////////////////////////////////////////Pz83Nzct7e3nJyc + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqaq6urzc3N8/Pz//////////////////////////////////////////////////////////////// + ////09PT09PT////////////////////////////////////////////////////////////9fX1ysrK + oqKimpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqam5ubtra24uLi//////////////////////////////////////// + ////////////////////09PT09PT//////////////////////////////////////////////////// + 9vb2xcXFnZ2dmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqara2t4ODg//////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + /////////f39z8/Pn5+fmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + sbGx6+vr////////////////////////////////////////////09PT09PT//////////////////// + ////////////////////6Ojoqqqqmpqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqam5ubxsbG+/v7////////////////////////////////////09PT09PT//// + /////////////////////////////f39ysrKm5ubmpqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqaoqKirq6utbW1uLi4uLi4tbW1rq6uo6Ojmpqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqaqKio6urq//////////////////////////// + ////09PT09PT////////////////////////////9fX1sbGxmpqampqampqampqampqampqampqampqa + mpqampqampqampqampqanJyctLS0z8/P5eXl+fn5////////////////////////////////+/v76enp + 1NTUvLy8oaGhmpqampqampqampqampqampqampqampqampqampqampqampqampqanJyc1tbW//////// + ////////////////////09PT09PT////////////////////////6+vrpKSkmpqampqampqampqampqa + mpqampqampqampqampqampqampqasrKy2NjY+fn5//////////////////////////////////////// + /////////////////////////v7+5eXlwsLCn5+fmpqampqampqampqampqampqampqampqampqampqa + mpqampqaxcXF/v7+////////////////////09PT09PT////////////////////5OTkn5+fmpqampqa + mpqampqampqampqampqampqampqampqam5ubvr6+7Ozs//////////////////////////////////// + ////////////////////////////////////////////////////+vr61NTUpqammpqampqampqampqa + mpqampqampqampqampqampqampqavb29/v7+////////////////09PT09PT////////////////4+Pj + nZ2dmpqampqampqampqampqampqampqampqampqampqauLi47+/v//////////////////////////// + /////////////////////////////////////////////////////////////////////////////f39 + 1dXVoqKimpqampqampqampqampqampqampqampqampqampqavb29/v7+////////////09PT09PT//// + ////////6OjonZ2dmpqampqampqampqampqampqampqampqampqapaWl4eHh//////////////////// + ////////////////////////+/v76enp3d3d19fX19fX3d3d6enp+/v7//////////////////////// + ////////////////////+fn5w8PDmpqampqampqampqampqampqampqampqampqampqaxsbG//////// + ////09PT09PT////////8vLyoaGhmpqampqampqampqampqampqampqampqampqavr6++fn5//////// + ////////////////////////////9vb20NDQsLCwm5ubmpqampqampqampqampqampqam5ubsLCw0NDQ + 9vb2////////////////////////////////////////5OTkpKSkmpqampqampqampqampqampqampqa + mpqampqa29vb////////09PT09PT/////f39rq6umpqampqampqampqampqampqampqampqanJyc19fX + ////////////////////////////////////9/f3xMTEnZ2dmpqampqampqampqampqampqampqampqa + mpqampqampqampqanZ2dxMTE9/f3////////////////////////////////////9vb2sbGxmpqampqa + mpqampqampqampqampqampqan5+f8/Pz////09PT09PT////zMzMmpqampqampqampqampqampqampqa + mpqaoKCg5ubm////////////////////////////////////39/foqKimpqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqaoqKi39/f//////////////////////////////// + /////Pz8urq6mpqampqampqampqampqampqampqampqau7u7////09PT09PT8/PznZ2dmpqampqampqa + mpqampqampqampqaoaGh7Ozs////////////////////////////////////zMzMmpqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqazMzM//////////// + /////////////////////////f39urq6mpqampqampqampqampqampqampqampqa7Ozs09PT09PTx8fH + mpqampqampqampqampqampqampqanp6e6urq////////////////////////////////////ysrKmpqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqaysrK/////////////////////////////////////Pz8sLCwmpqampqampqampqampqampqampqa + w8PD09PT09PTpaWlmpqampqampqampqampqampqampqa3t7e//////////////////////////////// + ////2dnZmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqa2dnZ////////////////////////////////////8/Pzn5+fmpqampqa + mpqampqampqampqapaWl09PT09PTm5ubmpqampqampqampqampqampqav7+///////////////////// + ////////////////8/Pznp6empqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqan5+f8/Pz//////////////////////////////// + ////zc3Nmpqampqampqampqampqampqam5ub09PT09PTrKysmpqampqampqampqampqam5ub8vLy//// + ////////////////////////////////vb29mpqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqavb29//////////////// + ////////////////////8/PzmpqampqampqampqampqampqarKys09PT09PT39/fmpqampqampqampqa + mpqawsLC////////////////////////////////////8fHxmpqampqampqampqampqampqampqampqa + mpqasLCwxcXFrq6umpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqam5ub + 8fHx////////////////////////////////////wsLCmpqampqampqampqampqa39/f09PT09PT//// + 3d3dqKiompqaoKCgysrK/f39////////////////////////////////////zMzMmpqampqampqampqa + mpqampqampqampqazs7O////////////yMjImpqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqazMzM/////////////////////////////////////f39ysrKoKCgmpqaqKio3d3d + ////09PT09PT////////////+/v7/v7+////////////////////////////////////////////r6+v + mpqampqampqampqampqampqampqaqqqq/////////////////f39paWlmpqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqar6+v//////////////////////////////////////////// + /v7++/v7////////////09PT09PT//////////////////////////////////////////////////// + /////////f39nJycmpqampqampqampqampqampqampqavb29////////////////////uLi4mpqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqanJyc/v7+//////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + ////////////////////////9PT0mpqampqampqampqampqampqampqampqavr6+//////////////// + ////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa9PT0//////// + ////////////////////////////////////////////////////09PT09PT////////////+vz//f7/ + ////////////////////////////////////////7+/vmpqampqampqampqampqampqampqampqavr6+ + ////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqa7u7u/////////////////////////////////////////f7/+vz/////////////09PT09PT//// + rMn/J3X/Al7/FGn/fKr/+/z/////////////////////////////////8/Pzmpqampqampqampqampqa + mpqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqa8/Pz////////////////////////////////+/z/e6r/FGn/Al7/KHX/rMn/ + ////09PT09PTsMv/AV7/AF7/AF7/AF7/AF7/aJ7//////////////////////////////////Pz8m5ub + mpqampqampqampqampqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqam5ub/f39////////////////////////////////aJ7/AF7/ + AF7/AF7/AF7/Al//sMz/09PT09PTMHv/AF7/AF7/AF7/AF7/AF7/A1//4+3///////////////////// + ////////////rKysmpqampqampqampqampqampqampqavr6+////////////////////ubm5mpqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqarKys//////////////////////////// + ////3+r/Al7/AF7/AF7/AF7/AF7/AF7/MHv/09PT09PTBGD/AF7/AF7/AF7/AF7/AF7/AF7/hbD///// + ////////////////////////////x8fHmpqampqampqampqampqampqampqavr6+//////////////// + ////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqax8fH//////////// + ////////////////////YZr/AF7/AF7/AF7/AF7/AF7/AF7/BGD/09PT09PTHm//AF7/AF7/AF7/AF7/ + AF7/AF7/D2b/4uz/////////////////////////////7Ozsmpqampqampqampqampqampqampqavr6+ + ////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqa + 7Ozs////////////////////////////rcr/AV7/AF7/AF7/AF7/AF7/AF7/AF7/HnD/09PT09PTaZ// + AF7/AF7/AF7/AF7/AF7/AF7/AF7/OoH/+Pr/////////////////////////////tbW1mpqampqampqa + mpqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqa + mpqampqampqatbW1////////////////////////////zN7/DGX/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + dKX/09PT09PTz+D/AV7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/VZH//P3///////////////////////// + 7e3tm5ubmpqampqampqampqampqauLi4////////////////////srKympqampqampqampqampqampqa + mpqampqampqampqampqampqanJyc7e3t////////////////////////0OD/FGn/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/CWP/4+z/09PT09PT////VJH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/VZH/+fv///// + ////////////////////zs7OmpqampqampqampqampqanZ2d8vLy////////////7e3tm5ubmpqampqa + mpqampqampqampqampqampqampqampqampqampqazs7O////////////////////////wtf/EWj/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/gK3/////09PT09PT////4ez/Dmb/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/PYP/6fD//////////////////////v7+vb29mpqampqampqampqampqaqKio4+Pj+fn54ODg + paWlmpqampqampqampqampqampqampqampqampqampqampqampqavLy8/v7+//////////////////// + nL//B2L/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/NH3/+vv/////09PT09PT////////pcX/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/G27/vtX//////////////////////f39vb29mpqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqavb29/f39//////// + ////////8fb/Xpj/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/3+r/////////09PT09PT//// + ////////c6T/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Al//bKD/8fb///////////////////// + 0NDQnJycmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqanJyc0NDQ + ////////////////////ttD/H3D/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CmT/xtr///////// + ////09PT09PT/////////////f3/WZX/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/GGz/mL3/ + +/z/////////////////7u7utra2mpqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqatra27u7u////////////////2OX/T47/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CWP/ + utL/////////////////09PT09PT////////////////+vz/WZT/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/InL/lbr/9Pj/////////////////6urqwsLCoqKimpqampqampqampqampqampqa + mpqampqaoqKiwsLC6urq////////////////0+L/XZf/BGD/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/DWX/vdT/////////////////////09PT09PT/////////////////////P3/bqL/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/EGf/Z53/wdb//P3//////////////v7+7e3t2tra + zs7OyMjIyMjIzs7O2tra7e3t/v7+////////////8PX/oMH/P4T/AV7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/HG7/z9//////////////////////////09PT09PT//////////////////// + ////////mL3/BmH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/WJT/lrv/ + ytz/9fn/////////////////////////////////8fb/wdb/iLL/RIj/B2L/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/PYP/5+//////////////////////////////09PT09PT//// + ////////////////////////////zN7/JnT/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/Al7/Gm3/NH3/Ron/To7/T47/R4n/NH3/GGz/AV3/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/A1//fKv/+/z///////////////////////////// + ////09PT09PT////////////////////////////////////9Pj/cKP/Al//AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Knf/x9r///////////////////// + ////////////////////09PT09PT////////////////////////////////////////////zd7/PIP/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Dmb/ibP/+fv///////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + /////////////v7/sc3/MXz/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CWP/cKP/6fH/ + ////////////////////////////////////////////////////09PT09PT//////////////////// + /////////////////////////////////////v//uNH/Sov/Al7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/ + e6r/5+//////////////////////////////////////////////////////////////09PT09PT//// + ////////////////////////////////////////////////////////////////4Or/hLD/LXj/AV7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + BmH/TI3/qcf/9/r///////////////////////////////////////////////////////////////// + ////09PT09PT//////////////////////////////////////////////////////////////////// + ////////////3en/l7z/V5P/HW//AV7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + A17/KXb/Zp3/q8n/7/X///////////////////////////////////////////////////////////// + ////////////////////09PT09PT//////////////////////////////////////////////////// + /////////////////////////////////////////v//7PL/wtf/n8H/g6//bqL/YJn/WZT/WJT/X5n/ + bqL/hLD/osP/x9r/8fb///////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////09PT09PT//////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////09PT09PT//// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////09PT09PT//////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////09PT09PT//////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PTAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + + + \ No newline at end of file diff --git a/GUI.NET/Forms/Cheats/frmCheat.Designer.cs b/GUI.NET/Forms/Cheats/frmCheat.Designer.cs new file mode 100644 index 00000000..16f42403 --- /dev/null +++ b/GUI.NET/Forms/Cheats/frmCheat.Designer.cs @@ -0,0 +1,418 @@ +namespace Mesen.GUI.Forms.Cheats +{ + partial class frmCheat + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if(disposing && (components != null)) { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmCheat)); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.txtCheatName = new System.Windows.Forms.TextBox(); + this.grpCode = new System.Windows.Forms.GroupBox(); + this.tlpAdd = new System.Windows.Forms.TableLayoutPanel(); + this.radCustom = new System.Windows.Forms.RadioButton(); + this.txtProActionRocky = new System.Windows.Forms.TextBox(); + this.txtGameGenie = new System.Windows.Forms.TextBox(); + this.radGameGenie = new System.Windows.Forms.RadioButton(); + this.radProActionRocky = new System.Windows.Forms.RadioButton(); + this.tlpCustom = new System.Windows.Forms.TableLayoutPanel(); + this.lblAddress = new System.Windows.Forms.Label(); + this.txtAddress = new System.Windows.Forms.TextBox(); + this.lblNewValue = new System.Windows.Forms.Label(); + this.lblCompare = new System.Windows.Forms.Label(); + this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); + this.radRelativeAddress = new System.Windows.Forms.RadioButton(); + this.radAbsoluteAddress = new System.Windows.Forms.RadioButton(); + this.txtValue = new System.Windows.Forms.TextBox(); + this.txtCompare = new System.Windows.Forms.TextBox(); + this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel(); + this.txtGameName = new System.Windows.Forms.TextBox(); + this.btnBrowse = new System.Windows.Forms.Button(); + this.chkEnabled = new System.Windows.Forms.CheckBox(); + this.tableLayoutPanel2.SuspendLayout(); + this.grpCode.SuspendLayout(); + this.tlpAdd.SuspendLayout(); + this.tlpCustom.SuspendLayout(); + this.flowLayoutPanel2.SuspendLayout(); + this.flowLayoutPanel3.SuspendLayout(); + this.SuspendLayout(); + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 2; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Controls.Add(this.label2, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.label1, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.txtCheatName, 1, 1); + this.tableLayoutPanel2.Controls.Add(this.grpCode, 0, 3); + this.tableLayoutPanel2.Controls.Add(this.flowLayoutPanel3, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.chkEnabled, 0, 2); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 4; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(385, 264); + this.tableLayoutPanel2.TabIndex = 3; + // + // label2 + // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(3, 6); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(38, 13); + this.label2.TabIndex = 4; + this.label2.Text = "Game:"; + // + // label1 + // + this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(3, 32); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(69, 13); + this.label1.TabIndex = 1; + this.label1.Text = "Cheat Name:"; + // + // txtCheatName + // + this.txtCheatName.Dock = System.Windows.Forms.DockStyle.Fill; + this.txtCheatName.Location = new System.Drawing.Point(78, 29); + this.txtCheatName.MaxLength = 255; + this.txtCheatName.Name = "txtCheatName"; + this.txtCheatName.Size = new System.Drawing.Size(304, 20); + this.txtCheatName.TabIndex = 2; + this.txtCheatName.TextChanged += new System.EventHandler(this.txtBox_TextChanged); + // + // grpCode + // + this.tableLayoutPanel2.SetColumnSpan(this.grpCode, 2); + this.grpCode.Controls.Add(this.tlpAdd); + this.grpCode.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpCode.Location = new System.Drawing.Point(3, 78); + this.grpCode.Name = "grpCode"; + this.grpCode.Size = new System.Drawing.Size(379, 183); + this.grpCode.TabIndex = 3; + this.grpCode.TabStop = false; + this.grpCode.Text = "Code"; + // + // tlpAdd + // + this.tlpAdd.ColumnCount = 2; + this.tlpAdd.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpAdd.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpAdd.Controls.Add(this.radCustom, 0, 2); + this.tlpAdd.Controls.Add(this.txtProActionRocky, 1, 1); + this.tlpAdd.Controls.Add(this.txtGameGenie, 1, 0); + this.tlpAdd.Controls.Add(this.radGameGenie, 0, 0); + this.tlpAdd.Controls.Add(this.radProActionRocky, 0, 1); + this.tlpAdd.Controls.Add(this.tlpCustom, 1, 2); + this.tlpAdd.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpAdd.Location = new System.Drawing.Point(3, 16); + this.tlpAdd.Name = "tlpAdd"; + this.tlpAdd.RowCount = 3; + this.tlpAdd.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpAdd.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpAdd.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpAdd.Size = new System.Drawing.Size(373, 164); + this.tlpAdd.TabIndex = 0; + // + // radCustom + // + this.radCustom.AutoSize = true; + this.radCustom.Location = new System.Drawing.Point(3, 55); + this.radCustom.Name = "radCustom"; + this.radCustom.Size = new System.Drawing.Size(63, 17); + this.radCustom.TabIndex = 3; + this.radCustom.Text = "Custom:"; + this.radCustom.UseVisualStyleBackColor = true; + this.radCustom.CheckedChanged += new System.EventHandler(this.radType_CheckedChanged); + // + // txtProActionRocky + // + this.txtProActionRocky.Location = new System.Drawing.Point(120, 29); + this.txtProActionRocky.MaxLength = 8; + this.txtProActionRocky.Name = "txtProActionRocky"; + this.txtProActionRocky.Size = new System.Drawing.Size(71, 20); + this.txtProActionRocky.TabIndex = 1; + this.txtProActionRocky.TextChanged += new System.EventHandler(this.txtBox_TextChanged); + this.txtProActionRocky.Enter += new System.EventHandler(this.txtProActionRocky_Enter); + // + // txtGameGenie + // + this.txtGameGenie.Location = new System.Drawing.Point(120, 3); + this.txtGameGenie.MaxLength = 8; + this.txtGameGenie.Name = "txtGameGenie"; + this.txtGameGenie.Size = new System.Drawing.Size(71, 20); + this.txtGameGenie.TabIndex = 1; + this.txtGameGenie.TextChanged += new System.EventHandler(this.txtBox_TextChanged); + this.txtGameGenie.Enter += new System.EventHandler(this.txtGameGenie_Enter); + // + // radGameGenie + // + this.radGameGenie.AutoSize = true; + this.radGameGenie.Checked = true; + this.radGameGenie.Location = new System.Drawing.Point(3, 3); + this.radGameGenie.Name = "radGameGenie"; + this.radGameGenie.Size = new System.Drawing.Size(87, 17); + this.radGameGenie.TabIndex = 2; + this.radGameGenie.TabStop = true; + this.radGameGenie.Text = "Game Genie:"; + this.radGameGenie.UseVisualStyleBackColor = true; + this.radGameGenie.CheckedChanged += new System.EventHandler(this.radType_CheckedChanged); + // + // radProActionRocky + // + this.radProActionRocky.AutoSize = true; + this.radProActionRocky.Location = new System.Drawing.Point(3, 29); + this.radProActionRocky.Name = "radProActionRocky"; + this.radProActionRocky.Size = new System.Drawing.Size(111, 17); + this.radProActionRocky.TabIndex = 2; + this.radProActionRocky.Text = "Pro Action Rocky:"; + this.radProActionRocky.UseVisualStyleBackColor = true; + this.radProActionRocky.CheckedChanged += new System.EventHandler(this.radType_CheckedChanged); + // + // tlpCustom + // + this.tlpCustom.ColumnCount = 2; + this.tlpCustom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpCustom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpCustom.Controls.Add(this.lblAddress, 0, 0); + this.tlpCustom.Controls.Add(this.txtAddress, 1, 0); + this.tlpCustom.Controls.Add(this.lblNewValue, 0, 2); + this.tlpCustom.Controls.Add(this.lblCompare, 0, 3); + this.tlpCustom.Controls.Add(this.flowLayoutPanel2, 1, 1); + this.tlpCustom.Controls.Add(this.txtValue, 1, 2); + this.tlpCustom.Controls.Add(this.txtCompare, 1, 3); + this.tlpCustom.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpCustom.Location = new System.Drawing.Point(120, 55); + this.tlpCustom.Name = "tlpCustom"; + this.tlpCustom.RowCount = 5; + this.tlpCustom.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpCustom.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpCustom.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpCustom.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpCustom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpCustom.Size = new System.Drawing.Size(250, 106); + this.tlpCustom.TabIndex = 4; + // + // lblAddress + // + this.lblAddress.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblAddress.AutoSize = true; + this.lblAddress.Location = new System.Drawing.Point(3, 6); + this.lblAddress.Name = "lblAddress"; + this.lblAddress.Size = new System.Drawing.Size(48, 13); + this.lblAddress.TabIndex = 0; + this.lblAddress.Text = "Address:"; + // + // txtAddress + // + this.txtAddress.Location = new System.Drawing.Point(91, 3); + this.txtAddress.MaxLength = 8; + this.txtAddress.Name = "txtAddress"; + this.txtAddress.Size = new System.Drawing.Size(69, 20); + this.txtAddress.TabIndex = 1; + this.txtAddress.TextChanged += new System.EventHandler(this.txtBox_TextChanged); + this.txtAddress.Enter += new System.EventHandler(this.customField_Enter); + // + // lblNewValue + // + this.lblNewValue.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblNewValue.AutoSize = true; + this.lblNewValue.Location = new System.Drawing.Point(3, 59); + this.lblNewValue.Name = "lblNewValue"; + this.lblNewValue.Size = new System.Drawing.Size(62, 13); + this.lblNewValue.TabIndex = 3; + this.lblNewValue.Text = "New Value:"; + // + // lblCompare + // + this.lblCompare.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblCompare.AutoSize = true; + this.lblCompare.Location = new System.Drawing.Point(3, 85); + this.lblCompare.Name = "lblCompare"; + this.lblCompare.Size = new System.Drawing.Size(82, 13); + this.lblCompare.TabIndex = 2; + this.lblCompare.Text = "Compare Value:"; + // + // flowLayoutPanel2 + // + this.flowLayoutPanel2.Controls.Add(this.radRelativeAddress); + this.flowLayoutPanel2.Controls.Add(this.radAbsoluteAddress); + this.flowLayoutPanel2.Location = new System.Drawing.Point(88, 26); + this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); + this.flowLayoutPanel2.Name = "flowLayoutPanel2"; + this.flowLayoutPanel2.Size = new System.Drawing.Size(159, 27); + this.flowLayoutPanel2.TabIndex = 4; + // + // radRelativeAddress + // + this.radRelativeAddress.AutoSize = true; + this.radRelativeAddress.Checked = true; + this.radRelativeAddress.Location = new System.Drawing.Point(3, 3); + this.radRelativeAddress.Name = "radRelativeAddress"; + this.radRelativeAddress.Size = new System.Drawing.Size(62, 17); + this.radRelativeAddress.TabIndex = 0; + this.radRelativeAddress.TabStop = true; + this.radRelativeAddress.Text = "Memory"; + this.radRelativeAddress.UseVisualStyleBackColor = true; + this.radRelativeAddress.Enter += new System.EventHandler(this.customField_Enter); + // + // radAbsoluteAddress + // + this.radAbsoluteAddress.AutoSize = true; + this.radAbsoluteAddress.Location = new System.Drawing.Point(71, 3); + this.radAbsoluteAddress.Name = "radAbsoluteAddress"; + this.radAbsoluteAddress.Size = new System.Drawing.Size(81, 17); + this.radAbsoluteAddress.TabIndex = 1; + this.radAbsoluteAddress.Text = "Game Code"; + this.radAbsoluteAddress.UseVisualStyleBackColor = true; + this.radAbsoluteAddress.Enter += new System.EventHandler(this.customField_Enter); + // + // txtValue + // + this.txtValue.Location = new System.Drawing.Point(91, 56); + this.txtValue.MaxLength = 2; + this.txtValue.Name = "txtValue"; + this.txtValue.Size = new System.Drawing.Size(30, 20); + this.txtValue.TabIndex = 5; + this.txtValue.TextChanged += new System.EventHandler(this.txtBox_TextChanged); + this.txtValue.Enter += new System.EventHandler(this.customField_Enter); + // + // txtCompare + // + this.txtCompare.Location = new System.Drawing.Point(91, 82); + this.txtCompare.MaxLength = 2; + this.txtCompare.Name = "txtCompare"; + this.txtCompare.Size = new System.Drawing.Size(30, 20); + this.txtCompare.TabIndex = 6; + this.txtCompare.TextChanged += new System.EventHandler(this.txtBox_TextChanged); + // + // flowLayoutPanel3 + // + this.flowLayoutPanel3.Controls.Add(this.txtGameName); + this.flowLayoutPanel3.Controls.Add(this.btnBrowse); + this.flowLayoutPanel3.Location = new System.Drawing.Point(75, 0); + this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(0); + this.flowLayoutPanel3.Name = "flowLayoutPanel3"; + this.flowLayoutPanel3.Size = new System.Drawing.Size(310, 26); + this.flowLayoutPanel3.TabIndex = 5; + // + // txtGame + // + this.txtGameName.Location = new System.Drawing.Point(3, 3); + this.txtGameName.Name = "txtGame"; + this.txtGameName.ReadOnly = true; + this.txtGameName.Size = new System.Drawing.Size(223, 20); + this.txtGameName.TabIndex = 0; + // + // btnBrowse + // + this.btnBrowse.Location = new System.Drawing.Point(232, 3); + this.btnBrowse.Name = "btnBrowse"; + this.btnBrowse.Size = new System.Drawing.Size(75, 23); + this.btnBrowse.TabIndex = 1; + this.btnBrowse.Text = "Browse..."; + this.btnBrowse.UseVisualStyleBackColor = true; + this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click); + // + // chkEnabled + // + this.chkEnabled.AutoSize = true; + this.tableLayoutPanel2.SetColumnSpan(this.chkEnabled, 2); + this.chkEnabled.Location = new System.Drawing.Point(3, 55); + this.chkEnabled.Name = "chkEnabled"; + this.chkEnabled.Size = new System.Drawing.Size(96, 17); + this.chkEnabled.TabIndex = 6; + this.chkEnabled.Text = "Cheat Enabled"; + this.chkEnabled.UseVisualStyleBackColor = true; + // + // frmCheat + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(385, 294); + this.Controls.Add(this.tableLayoutPanel2); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximumSize = new System.Drawing.Size(401, 332); + this.MinimumSize = new System.Drawing.Size(401, 332); + this.Name = "frmCheat"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Edit Cheat"; + this.Controls.SetChildIndex(this.tableLayoutPanel2, 0); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel2.PerformLayout(); + this.grpCode.ResumeLayout(false); + this.tlpAdd.ResumeLayout(false); + this.tlpAdd.PerformLayout(); + this.tlpCustom.ResumeLayout(false); + this.tlpCustom.PerformLayout(); + this.flowLayoutPanel2.ResumeLayout(false); + this.flowLayoutPanel2.PerformLayout(); + this.flowLayoutPanel3.ResumeLayout(false); + this.flowLayoutPanel3.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox txtCheatName; + private System.Windows.Forms.GroupBox grpCode; + private System.Windows.Forms.TableLayoutPanel tlpAdd; + private System.Windows.Forms.RadioButton radCustom; + private System.Windows.Forms.TextBox txtProActionRocky; + private System.Windows.Forms.TextBox txtGameGenie; + private System.Windows.Forms.RadioButton radGameGenie; + private System.Windows.Forms.RadioButton radProActionRocky; + private System.Windows.Forms.TableLayoutPanel tlpCustom; + private System.Windows.Forms.Label lblAddress; + private System.Windows.Forms.TextBox txtAddress; + private System.Windows.Forms.Label lblNewValue; + private System.Windows.Forms.Label lblCompare; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2; + private System.Windows.Forms.RadioButton radRelativeAddress; + private System.Windows.Forms.RadioButton radAbsoluteAddress; + private System.Windows.Forms.TextBox txtValue; + private System.Windows.Forms.TextBox txtCompare; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel3; + private System.Windows.Forms.TextBox txtGameName; + private System.Windows.Forms.Button btnBrowse; + private System.Windows.Forms.CheckBox chkEnabled; + + + } +} \ No newline at end of file diff --git a/GUI.NET/Forms/Cheats/frmCheat.cs b/GUI.NET/Forms/Cheats/frmCheat.cs new file mode 100644 index 00000000..3b70da7f --- /dev/null +++ b/GUI.NET/Forms/Cheats/frmCheat.cs @@ -0,0 +1,199 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.IO; +using System.IO.Compression; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Mesen.GUI.Config; + +namespace Mesen.GUI.Forms.Cheats +{ + public partial class frmCheat : BaseConfigForm + { + const int GGShortCodeLength = 6; + const int GGLongCodeLength = 8; + const int PARCodeLength = 8; + + private string _gameHash; + + CheatInfo _originalCheat; + + public frmCheat(CheatInfo cheat) + { + InitializeComponent(); + + _originalCheat = cheat; + if(cheat != null) { + UpdateUI(cheat); + } + UpdateOKButton(); + } + + protected override bool ApplyChangesOnOK + { + get { return false; } + } + + protected override void UpdateConfig() + { + if(ConfigManager.Config.Cheats.Contains(_originalCheat)) { + ConfigManager.Config.Cheats.Remove(_originalCheat); + } + ConfigManager.Config.Cheats.Add(GetCheatInfo()); + } + + private void UpdateOKButton() + { + btnOK.Enabled = this.IsValidInput(); + } + + private string GetMD5Hash(string filename) + { + var md5 = System.Security.Cryptography.MD5.Create(); + if(filename.EndsWith(".nes", StringComparison.InvariantCultureIgnoreCase)) { + return BitConverter.ToString(md5.ComputeHash(File.ReadAllBytes(filename))).Replace("-", ""); + } else if(filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase)) { + foreach(var entry in ZipFile.OpenRead(filename).Entries) { + if(entry.Name.EndsWith(".nes", StringComparison.InvariantCultureIgnoreCase)) { + return BitConverter.ToString(md5.ComputeHash(entry.Open())).Replace("-", ""); + } + } + } + return null; + } + + private void btnBrowse_Click(object sender, EventArgs e) + { + OpenFileDialog ofd = new OpenFileDialog(); + ofd.Filter = "All supported formats (*.nes, *.zip)|*.NES;*.ZIP|NES Roms (*.nes)|*.NES|ZIP Archives (*.zip)|*.ZIP"; + if(ofd.ShowDialog() == System.Windows.Forms.DialogResult.OK) { + _gameHash = GetMD5Hash(ofd.FileName); + if(_gameHash != null) { + txtGameName.Text = Path.GetFileNameWithoutExtension(ofd.FileName); + UpdateOKButton(); + } + } + } + + public bool IsValidInput() + { + if(radCustom.Checked) { + UInt32 val; + Byte byteVal; + if(!UInt32.TryParse(txtAddress.Text, System.Globalization.NumberStyles.AllowHexSpecifier, null, out val)) { + return false; + } + + if(!Byte.TryParse(txtValue.Text, System.Globalization.NumberStyles.AllowHexSpecifier, null, out byteVal)) { + return false; + } + + if(!Byte.TryParse(txtCompare.Text, System.Globalization.NumberStyles.AllowHexSpecifier, null, out byteVal)) { + return false; + } + } + + CheatInfo cheat; + try { + cheat = this.GetCheatInfo(); + } catch { + return false; + } + + if(cheat.GameHash == null) { + return false; + } + + if(string.IsNullOrWhiteSpace(cheat.CheatName)) { + return false; + } + + if(cheat.CheatType == CheatType.GameGenie) { + if(cheat.Code.Length != frmCheat.GGShortCodeLength && cheat.Code.Length != frmCheat.GGLongCodeLength) { + return false; + } + } else if(cheat.CheatType == CheatType.ProActionRocky) { + if(cheat.Code.Length != frmCheat.PARCodeLength) { + return false; + } + } + + return true; + } + + public CheatInfo GetCheatInfo() + { + return new CheatInfo() { + Enabled = chkEnabled.Checked, + CheatName = txtCheatName.Text, + GameName = txtGameName.Text, + GameHash = _gameHash, + CheatType = radGameGenie.Checked ? CheatType.GameGenie : radProActionRocky.Checked ? CheatType.ProActionRocky : CheatType.Custom, + Code = (radGameGenie.Checked ? txtGameGenie.Text : txtProActionRocky.Text).ToUpper(), + Address = radCustom.Checked ? UInt32.Parse(txtAddress.Text, System.Globalization.NumberStyles.AllowHexSpecifier) : 0, + Value = radCustom.Checked ? Byte.Parse(txtValue.Text, System.Globalization.NumberStyles.AllowHexSpecifier) : (byte)0, + CompareValue = radCustom.Checked ? Byte.Parse(txtCompare.Text, System.Globalization.NumberStyles.AllowHexSpecifier) : (byte)0, + IsRelativeAddress = radRelativeAddress.Checked + }; + } + + private void UpdateUI(CheatInfo cheat) + { + chkEnabled.Checked = cheat.Enabled; + txtCheatName.Text = cheat.CheatName; + txtGameName.Text = cheat.GameName; + _gameHash = cheat.GameHash; + switch(cheat.CheatType) { + case CheatType.GameGenie: + radGameGenie.Checked = true; + txtGameGenie.Text = cheat.Code; + break; + case CheatType.ProActionRocky: + radProActionRocky.Checked = true; + txtProActionRocky.Text = cheat.Code; + break; + case CheatType.Custom: + radCustom.Checked = true; + txtAddress.Text = cheat.Address.ToString("X"); + txtValue.Text = cheat.Value.ToString("X"); + txtCompare.Text = cheat.CompareValue.ToString("X"); + radAbsoluteAddress.Checked = !cheat.IsRelativeAddress; + radRelativeAddress.Checked = cheat.IsRelativeAddress; + break; + } + } + + private void txtBox_TextChanged(object sender, EventArgs e) + { + UpdateOKButton(); + } + + private void txtGameGenie_Enter(object sender, EventArgs e) + { + radGameGenie.Checked = true; + UpdateOKButton(); + } + + private void txtProActionRocky_Enter(object sender, EventArgs e) + { + radProActionRocky.Checked = true; + UpdateOKButton(); + } + + private void customField_Enter(object sender, EventArgs e) + { + radCustom.Checked = true; + UpdateOKButton(); + } + + private void radType_CheckedChanged(object sender, EventArgs e) + { + UpdateOKButton(); + } + } +} diff --git a/GUI.NET/Forms/Cheats/frmCheat.resx b/GUI.NET/Forms/Cheats/frmCheat.resx new file mode 100644 index 00000000..f7d049ce --- /dev/null +++ b/GUI.NET/Forms/Cheats/frmCheat.resx @@ -0,0 +1,409 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + AAABAAMAEBAAAAAAGABoAwAANgAAACAgAAAAABgAqAwAAJ4DAABAQAAAAAAYACgyAABGEAAAKAAAABAA + AAAgAAAAAQAYAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAANPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT0/////////////////////////7+/v7+/v///////////////////////9PT09PT + 0////////////+np6cHBwaamppubm5qamqWlpb6+vuTk5P///////////9PT09PT0/////j4+Ly8vJqa + mpqamq2trb6+vr6+vq6urpubm5qamrW1tfT09P///9PT09PT0/b29qqqqpqamry8vPDw8Pz8/Ofn5+fn + 5/z8/PPz88PDw5ubm6WlpfLy8tPT09PT07a2tpqamtbW1v///+Li4qKiopqampqamqKiouLi4v///9/f + 35ubm7Ozs9PT09PT06WlpcPDw/////T09J6enp6enqmpqZqampqamp6envT09P///8XFxaWlpdPT09PT + 0/f5/f7+/////9jY2JqamsTExO3t7ZqampqampqamtjY2P////7+//f5/dPT09PT0xxv/22i/////93d + 3ZqamsbGxu/v75qampqampqamt3d3f///2mg/xxv/9PT09PT00CG/wRg/67L//v7+6mpqbq6uuHh4Zqa + mpqamqmpqfv7+5e9/wFf/0eL/9PT09PT093q/xtv/wJf/2mg/9ji9b29vaCgoKCgoL29vc/d9FeV/wBe + /yh3/+jw/9PT09PT0////+Pt/0SJ/wBe/wJf/zR//1uX/1qX/zF8/wFf/wBe/1eV/+70/////9PT09PT + 0////////////7zU/1yY/x1w/wFf/wFf/x9x/2Kc/8jc/////////////9PT09PT0/////////////// + //////////z9//z9/////////////////////////9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT0///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAIAAAAEAAAAABABgAAAAAAAAMAAAAAAAAAAAAAAAA + AAAAAAAA09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT//////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////09PT09PT//////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////09PT09PT//// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + /Pz84eHhycnJtra2qqqqpKSkpKSkqqqqtra2x8fH3t7e+fn5//////////////////////////////// + ////09PT09PT////////////////////////////7u7uwcHBn5+fmpqampqampqampqampqampqampqa + mpqampqampqanJycubm54+Pj////////////////////////////09PT09PT//////////////////// + 8/Pzvb29m5ubmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqasLCw6Ojo + ////////////////////09PT09PT////////////////2NjYn5+fmpqampqampqampqampqampqapqam + tbW1vb29vb29tbW1p6enmpqampqampqampqampqampqam5ubxcXF/Pz8////////////09PT09PT//// + /////f39wcHBmpqampqampqampqampqarKys1NTU8/Pz////////////////////////9vb22tratbW1 + mpqampqampqampqampqasLCw9vb2////////09PT09PT/////f39ubm5mpqampqampqampqaqqqq4eHh + ////////////////////////////////////////////////7e3tt7e3mpqampqampqampqaq6ur9/f3 + ////09PT09PT////wcHBmpqampqampqampqayMjI/Pz8////////////7e3txMTEqqqqnZ2dnZ2dqqqq + xMTE7e3t////////////////29vbn5+fmpqampqampqatLS0/v7+09PT09PT3t7empqampqampqanJyc + 3Nzc/////////////f39xsbGm5ubmpqampqampqampqampqampqam5ubxsbG/f39////////////7Ozs + o6Ojmpqampqampqa1tbW09PT09PTrKysmpqampqampqa3d3d/////////////v7+u7u7mpqampqampqa + mpqampqampqampqampqampqampqau7u7/v7+////////////6urqnZ2dmpqampqaqqqq09PT09PTnZ2d + mpqampqawcHB////////////////1dXVmpqampqampqampqampqampqampqampqampqampqampqampqa + 1dXV////////////////xcXFmpqampqanZ2d09PT09PTz8/Pm5ubqKio8/Pz/////////////v7+pKSk + mpqampqampqavLy819fXpaWlmpqampqampqampqampqampqapaWl/v7+////////////8/PzqKiom5ub + 0NDQ09PT09PT/////Pz8/v7+////////////////6+vrmpqampqampqanp6e/f39////19fXmpqampqa + mpqampqampqampqampqa6+vr/////////////////v7+/Pz8////09PT09PT////+Pr//v7///////// + ////////3t7empqampqampqaoqKi////////3d3dmpqampqampqampqampqampqampqa3t7e//////// + /////////v7/+Pr/////09PT09PTiLP/BWD/JXT/4ez/////////////4uLimpqampqampqaoqKi//// + ////3d3dmpqampqampqampqampqampqampqa4uLi////////////4ez/JXT/BWD/ibP/09PT09PTCmT/ + AF7/AF7/b6P/////////////9vb2m5ubmpqampqaoqKi////////3d3dmpqampqampqampqampqampqa + m5ub9vb2////////////Y5z/AF7/AF7/CmT/09PT09PTKnj/AF7/AF7/B2L/zN7/////////////ubm5 + mpqampqaoqKi////////3d3dmpqampqampqampqampqampqauLi4////////////qsj/AV//AF7/AF7/ + Lnr/09PT09PTmr7/AF7/AF7/AF7/F2z/0eH/////////8PDwn5+fmpqam5ub8fHx////yMjImpqampqa + mpqampqampqan5+f8PDw////////qMf/BmH/AF7/AF7/AF7/rcv/09PT09PT/f3/Qof/AF7/AF7/AF7/ + DWb/pcX/////////5eXloKCgmpqaoaGhsbGxmpqampqampqampqampqaoKCg5eXl////+fv/dqf/AV// + AF7/AF7/AF7/ZJz/////09PT09PT////7PL/Knj/AF7/AF7/AF7/AF7/Soz/0uL/////8fHxurq6m5ub + mpqampqampqampqam5uburq68fHx////tM//KXf/AF7/AF7/AF7/AF7/UI//+vz/////09PT09PT//// + ////6vH/OIH/AF7/AF7/AF7/AF7/AV//RYn/osP/6vH/9PT02trazs7Ozs7O2tra9PT04uz/k7r/L3v/ + AF7/AF7/AF7/AF7/AF7/ZJz/+vz/////////09PT09PT////////////+Pr/bqP/Al//AF7/AF7/AF7/ + AF7/AF7/AV7/InP/Ror/WJX/WZX/RYn/HnD/AF7/AF7/AF7/AF7/AF7/AF7/DWb/ncH///////////// + ////09PT09PT////////////////////xtr/OIH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/Al//WZb/4u3/////////////////////09PT09PT//////////////////// + ////////utP/UJD/BmH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/DWb/ZZ3/1OP///////// + ////////////////////09PT09PT////////////////////////////////////8PX/rMr/cqX/R4r/ + Knj/G27/G27/Knj/SYv/d6n/ttD/9vn/////////////////////////////////////09PT09PT//// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////09PT09PT//////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAQAAAAIAAAAABABgAAAAAAAAwAAAAAAAAAAAAAAAA + AAAAAAAA09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT//////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////09PT09PT//////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////09PT09PT//// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////09PT09PT//////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////09PT09PT//////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + ////////////////////////////////////////////////////////////+vr66Ojo2dnZzc3NxMTE + v7+/vLy8vLy8v7+/xcXFzc3N2NjY5ubm+Pj4//////////////////////////////////////////// + ////////////////////////////////////////////////////09PT09PT//////////////////// + ////////////////////////////////////////////////////////////+fn53d3dwsLCqqqqmpqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqapaWlvLy81dXV8vLy//////////// + ////////////////////////////////////////////////////////////////////09PT09PT//// + /////////////////////////////////////////////////////////////////Pz83Nzct7e3nJyc + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqaq6urzc3N8/Pz//////////////////////////////////////////////////////////////// + ////09PT09PT////////////////////////////////////////////////////////////9fX1ysrK + oqKimpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqam5ubtra24uLi//////////////////////////////////////// + ////////////////////09PT09PT//////////////////////////////////////////////////// + 9vb2xcXFnZ2dmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqara2t4ODg//////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + /////////f39z8/Pn5+fmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + sbGx6+vr////////////////////////////////////////////09PT09PT//////////////////// + ////////////////////6Ojoqqqqmpqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqam5ubxsbG+/v7////////////////////////////////////09PT09PT//// + /////////////////////////////f39ysrKm5ubmpqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqaoqKirq6utbW1uLi4uLi4tbW1rq6uo6Ojmpqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqaqKio6urq//////////////////////////// + ////09PT09PT////////////////////////////9fX1sbGxmpqampqampqampqampqampqampqampqa + mpqampqampqampqampqanJyctLS0z8/P5eXl+fn5////////////////////////////////+/v76enp + 1NTUvLy8oaGhmpqampqampqampqampqampqampqampqampqampqampqampqampqanJyc1tbW//////// + ////////////////////09PT09PT////////////////////////6+vrpKSkmpqampqampqampqampqa + mpqampqampqampqampqampqampqasrKy2NjY+fn5//////////////////////////////////////// + /////////////////////////v7+5eXlwsLCn5+fmpqampqampqampqampqampqampqampqampqampqa + mpqampqaxcXF/v7+////////////////////09PT09PT////////////////////5OTkn5+fmpqampqa + mpqampqampqampqampqampqampqampqam5ubvr6+7Ozs//////////////////////////////////// + ////////////////////////////////////////////////////+vr61NTUpqammpqampqampqampqa + mpqampqampqampqampqampqampqavb29/v7+////////////////09PT09PT////////////////4+Pj + nZ2dmpqampqampqampqampqampqampqampqampqampqauLi47+/v//////////////////////////// + /////////////////////////////////////////////////////////////////////////////f39 + 1dXVoqKimpqampqampqampqampqampqampqampqampqampqavb29/v7+////////////09PT09PT//// + ////////6OjonZ2dmpqampqampqampqampqampqampqampqampqapaWl4eHh//////////////////// + ////////////////////////+/v76enp3d3d19fX19fX3d3d6enp+/v7//////////////////////// + ////////////////////+fn5w8PDmpqampqampqampqampqampqampqampqampqampqaxsbG//////// + ////09PT09PT////////8vLyoaGhmpqampqampqampqampqampqampqampqampqavr6++fn5//////// + ////////////////////////////9vb20NDQsLCwm5ubmpqampqampqampqampqampqam5ubsLCw0NDQ + 9vb2////////////////////////////////////////5OTkpKSkmpqampqampqampqampqampqampqa + mpqampqa29vb////////09PT09PT/////f39rq6umpqampqampqampqampqampqampqampqanJyc19fX + ////////////////////////////////////9/f3xMTEnZ2dmpqampqampqampqampqampqampqampqa + mpqampqampqampqanZ2dxMTE9/f3////////////////////////////////////9vb2sbGxmpqampqa + mpqampqampqampqampqampqan5+f8/Pz////09PT09PT////zMzMmpqampqampqampqampqampqampqa + mpqaoKCg5ubm////////////////////////////////////39/foqKimpqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqaoqKi39/f//////////////////////////////// + /////Pz8urq6mpqampqampqampqampqampqampqampqau7u7////09PT09PT8/PznZ2dmpqampqampqa + mpqampqampqampqaoaGh7Ozs////////////////////////////////////zMzMmpqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqazMzM//////////// + /////////////////////////f39urq6mpqampqampqampqampqampqampqampqa7Ozs09PT09PTx8fH + mpqampqampqampqampqampqampqanp6e6urq////////////////////////////////////ysrKmpqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqaysrK/////////////////////////////////////Pz8sLCwmpqampqampqampqampqampqampqa + w8PD09PT09PTpaWlmpqampqampqampqampqampqampqa3t7e//////////////////////////////// + ////2dnZmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqa2dnZ////////////////////////////////////8/Pzn5+fmpqampqa + mpqampqampqampqapaWl09PT09PTm5ubmpqampqampqampqampqampqav7+///////////////////// + ////////////////8/Pznp6empqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqan5+f8/Pz//////////////////////////////// + ////zc3Nmpqampqampqampqampqampqam5ub09PT09PTrKysmpqampqampqampqampqam5ub8vLy//// + ////////////////////////////////vb29mpqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqavb29//////////////// + ////////////////////8/PzmpqampqampqampqampqampqarKys09PT09PT39/fmpqampqampqampqa + mpqawsLC////////////////////////////////////8fHxmpqampqampqampqampqampqampqampqa + mpqasLCwxcXFrq6umpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqam5ub + 8fHx////////////////////////////////////wsLCmpqampqampqampqampqa39/f09PT09PT//// + 3d3dqKiompqaoKCgysrK/f39////////////////////////////////////zMzMmpqampqampqampqa + mpqampqampqampqazs7O////////////yMjImpqampqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqazMzM/////////////////////////////////////f39ysrKoKCgmpqaqKio3d3d + ////09PT09PT////////////+/v7/v7+////////////////////////////////////////////r6+v + mpqampqampqampqampqampqampqaqqqq/////////////////f39paWlmpqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqar6+v//////////////////////////////////////////// + /v7++/v7////////////09PT09PT//////////////////////////////////////////////////// + /////////f39nJycmpqampqampqampqampqampqampqavb29////////////////////uLi4mpqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqanJyc/v7+//////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + ////////////////////////9PT0mpqampqampqampqampqampqampqampqavr6+//////////////// + ////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa9PT0//////// + ////////////////////////////////////////////////////09PT09PT////////////+vz//f7/ + ////////////////////////////////////////7+/vmpqampqampqampqampqampqampqampqavr6+ + ////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqa7u7u/////////////////////////////////////////f7/+vz/////////////09PT09PT//// + rMn/J3X/Al7/FGn/fKr/+/z/////////////////////////////////8/Pzmpqampqampqampqampqa + mpqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqa + mpqampqampqampqampqa8/Pz////////////////////////////////+/z/e6r/FGn/Al7/KHX/rMn/ + ////09PT09PTsMv/AV7/AF7/AF7/AF7/AF7/aJ7//////////////////////////////////Pz8m5ub + mpqampqampqampqampqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqa + mpqampqampqampqampqampqampqampqam5ub/f39////////////////////////////////aJ7/AF7/ + AF7/AF7/AF7/Al//sMz/09PT09PTMHv/AF7/AF7/AF7/AF7/AF7/A1//4+3///////////////////// + ////////////rKysmpqampqampqampqampqampqampqavr6+////////////////////ubm5mpqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqarKys//////////////////////////// + ////3+r/Al7/AF7/AF7/AF7/AF7/AF7/MHv/09PT09PTBGD/AF7/AF7/AF7/AF7/AF7/AF7/hbD///// + ////////////////////////////x8fHmpqampqampqampqampqampqampqavr6+//////////////// + ////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqax8fH//////////// + ////////////////////YZr/AF7/AF7/AF7/AF7/AF7/AF7/BGD/09PT09PTHm//AF7/AF7/AF7/AF7/ + AF7/AF7/D2b/4uz/////////////////////////////7Ozsmpqampqampqampqampqampqampqavr6+ + ////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqa + 7Ozs////////////////////////////rcr/AV7/AF7/AF7/AF7/AF7/AF7/AF7/HnD/09PT09PTaZ// + AF7/AF7/AF7/AF7/AF7/AF7/AF7/OoH/+Pr/////////////////////////////tbW1mpqampqampqa + mpqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqa + mpqampqampqatbW1////////////////////////////zN7/DGX/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + dKX/09PT09PTz+D/AV7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/VZH//P3///////////////////////// + 7e3tm5ubmpqampqampqampqampqauLi4////////////////////srKympqampqampqampqampqampqa + mpqampqampqampqampqampqanJyc7e3t////////////////////////0OD/FGn/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/CWP/4+z/09PT09PT////VJH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/VZH/+fv///// + ////////////////////zs7OmpqampqampqampqampqanZ2d8vLy////////////7e3tm5ubmpqampqa + mpqampqampqampqampqampqampqampqampqampqazs7O////////////////////////wtf/EWj/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/gK3/////09PT09PT////4ez/Dmb/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/PYP/6fD//////////////////////v7+vb29mpqampqampqampqampqaqKio4+Pj+fn54ODg + paWlmpqampqampqampqampqampqampqampqampqampqampqampqavLy8/v7+//////////////////// + nL//B2L/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/NH3/+vv/////09PT09PT////////pcX/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/G27/vtX//////////////////////f39vb29mpqampqampqampqa + mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqavb29/f39//////// + ////////8fb/Xpj/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/3+r/////////09PT09PT//// + ////////c6T/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Al//bKD/8fb///////////////////// + 0NDQnJycmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqanJyc0NDQ + ////////////////////ttD/H3D/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CmT/xtr///////// + ////09PT09PT/////////////f3/WZX/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/GGz/mL3/ + +/z/////////////////7u7utra2mpqampqampqampqampqampqampqampqampqampqampqampqampqa + mpqatra27u7u////////////////2OX/T47/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CWP/ + utL/////////////////09PT09PT////////////////+vz/WZT/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/InL/lbr/9Pj/////////////////6urqwsLCoqKimpqampqampqampqampqampqa + mpqampqaoqKiwsLC6urq////////////////0+L/XZf/BGD/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/DWX/vdT/////////////////////09PT09PT/////////////////////P3/bqL/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/EGf/Z53/wdb//P3//////////////v7+7e3t2tra + zs7OyMjIyMjIzs7O2tra7e3t/v7+////////////8PX/oMH/P4T/AV7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/HG7/z9//////////////////////////09PT09PT//////////////////// + ////////mL3/BmH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/WJT/lrv/ + ytz/9fn/////////////////////////////////8fb/wdb/iLL/RIj/B2L/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/PYP/5+//////////////////////////////09PT09PT//// + ////////////////////////////zN7/JnT/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/Al7/Gm3/NH3/Ron/To7/T47/R4n/NH3/GGz/AV3/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/A1//fKv/+/z///////////////////////////// + ////09PT09PT////////////////////////////////////9Pj/cKP/Al//AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Knf/x9r///////////////////// + ////////////////////09PT09PT////////////////////////////////////////////zd7/PIP/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Dmb/ibP/+fv///////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + /////////////v7/sc3/MXz/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CWP/cKP/6fH/ + ////////////////////////////////////////////////////09PT09PT//////////////////// + /////////////////////////////////////v//uNH/Sov/Al7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/ + e6r/5+//////////////////////////////////////////////////////////////09PT09PT//// + ////////////////////////////////////////////////////////////////4Or/hLD/LXj/AV7/ + AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + BmH/TI3/qcf/9/r///////////////////////////////////////////////////////////////// + ////09PT09PT//////////////////////////////////////////////////////////////////// + ////////////3en/l7z/V5P/HW//AV7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ + A17/KXb/Zp3/q8n/7/X///////////////////////////////////////////////////////////// + ////////////////////09PT09PT//////////////////////////////////////////////////// + /////////////////////////////////////////v//7PL/wtf/n8H/g6//bqL/YJn/WZT/WJT/X5n/ + bqL/hLD/osP/x9r/8fb///////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////09PT09PT//////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////09PT09PT//// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////09PT09PT//////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////09PT09PT//////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////09PT09PT//////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT + 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PTAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + + + \ No newline at end of file diff --git a/GUI.NET/Forms/Cheats/frmCheatList.Designer.cs b/GUI.NET/Forms/Cheats/frmCheatList.Designer.cs new file mode 100644 index 00000000..36eb928b --- /dev/null +++ b/GUI.NET/Forms/Cheats/frmCheatList.Designer.cs @@ -0,0 +1,224 @@ +using Mesen.GUI.Controls; +namespace Mesen.GUI.Forms.Cheats +{ + partial class frmCheatList + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if(disposing && (components != null)) { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmCheatList)); + this.tabMain = new System.Windows.Forms.TabControl(); + this.tabCheats = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.chkCurrentGameOnly = new System.Windows.Forms.CheckBox(); + this.lstCheats = new Mesen.GUI.Controls.MyListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.contextMenuCheats = new System.Windows.Forms.ContextMenuStrip(this.components); + this.mnuAddCheat = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuDeleteCheat = new System.Windows.Forms.ToolStripMenuItem(); + this.tabCheatFindTool = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.tabMain.SuspendLayout(); + this.tabCheats.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + this.contextMenuCheats.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + this.SuspendLayout(); + // + // tabMain + // + this.tabMain.Controls.Add(this.tabCheats); + this.tabMain.Controls.Add(this.tabCheatFindTool); + this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabMain.Location = new System.Drawing.Point(0, 0); + this.tabMain.Margin = new System.Windows.Forms.Padding(0); + this.tabMain.Name = "tabMain"; + this.tabMain.SelectedIndex = 0; + this.tabMain.Size = new System.Drawing.Size(443, 225); + this.tabMain.TabIndex = 0; + // + // tabCheats + // + this.tabCheats.Controls.Add(this.tableLayoutPanel1); + this.tabCheats.Location = new System.Drawing.Point(4, 22); + this.tabCheats.Name = "tabCheats"; + this.tabCheats.Padding = new System.Windows.Forms.Padding(3); + this.tabCheats.Size = new System.Drawing.Size(435, 199); + this.tabCheats.TabIndex = 0; + this.tabCheats.Text = "Cheats"; + this.tabCheats.UseVisualStyleBackColor = true; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.chkCurrentGameOnly, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.lstCheats, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(429, 193); + this.tableLayoutPanel1.TabIndex = 0; + // + // chkCurrentGameOnly + // + this.chkCurrentGameOnly.AutoSize = true; + this.tableLayoutPanel1.SetColumnSpan(this.chkCurrentGameOnly, 2); + this.chkCurrentGameOnly.Location = new System.Drawing.Point(3, 3); + this.chkCurrentGameOnly.Name = "chkCurrentGameOnly"; + this.chkCurrentGameOnly.Size = new System.Drawing.Size(208, 17); + this.chkCurrentGameOnly.TabIndex = 0; + this.chkCurrentGameOnly.Text = "Only show cheats for the current game"; + this.chkCurrentGameOnly.UseVisualStyleBackColor = true; + // + // lstCheats + // + this.lstCheats.CheckBoxes = true; + this.lstCheats.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1, + this.columnHeader2, + this.columnHeader3}); + this.tableLayoutPanel1.SetColumnSpan(this.lstCheats, 2); + this.lstCheats.ContextMenuStrip = this.contextMenuCheats; + this.lstCheats.Dock = System.Windows.Forms.DockStyle.Fill; + this.lstCheats.DoubleClickDoesCheck = false; + this.lstCheats.FullRowSelect = true; + this.lstCheats.GridLines = true; + this.lstCheats.Location = new System.Drawing.Point(3, 26); + this.lstCheats.Name = "lstCheats"; + this.lstCheats.Size = new System.Drawing.Size(423, 164); + this.lstCheats.TabIndex = 1; + this.lstCheats.UseCompatibleStateImageBehavior = false; + this.lstCheats.View = System.Windows.Forms.View.Details; + this.lstCheats.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.lstCheats_ItemChecked); + this.lstCheats.DoubleClick += new System.EventHandler(this.lstCheats_DoubleClick); + // + // columnHeader1 + // + this.columnHeader1.Text = "Game"; + this.columnHeader1.Width = 98; + // + // columnHeader2 + // + this.columnHeader2.Text = "Cheat Name"; + this.columnHeader2.Width = 110; + // + // columnHeader3 + // + this.columnHeader3.Text = "Code"; + this.columnHeader3.Width = 142; + // + // contextMenuCheats + // + this.contextMenuCheats.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuAddCheat, + this.mnuDeleteCheat}); + this.contextMenuCheats.Name = "contextMenuCheats"; + this.contextMenuCheats.Size = new System.Drawing.Size(160, 48); + // + // mnuAddCheat + // + this.mnuAddCheat.Name = "mnuAddCheat"; + this.mnuAddCheat.ShortcutKeys = System.Windows.Forms.Keys.Insert; + this.mnuAddCheat.Size = new System.Drawing.Size(159, 22); + this.mnuAddCheat.Text = "Add cheat..."; + this.mnuAddCheat.Click += new System.EventHandler(this.mnuAddCheat_Click); + // + // mnuDeleteCheat + // + this.mnuDeleteCheat.Name = "mnuDeleteCheat"; + this.mnuDeleteCheat.ShortcutKeys = System.Windows.Forms.Keys.Delete; + this.mnuDeleteCheat.Size = new System.Drawing.Size(159, 22); + this.mnuDeleteCheat.Text = "Delete"; + // + // tabCheatFindTool + // + this.tabCheatFindTool.Location = new System.Drawing.Point(4, 22); + this.tabCheatFindTool.Name = "tabCheatFindTool"; + this.tabCheatFindTool.Padding = new System.Windows.Forms.Padding(3); + this.tabCheatFindTool.Size = new System.Drawing.Size(435, 199); + this.tabCheatFindTool.TabIndex = 1; + this.tabCheatFindTool.Text = "Cheat Finder"; + this.tabCheatFindTool.UseVisualStyleBackColor = true; + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 1; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Controls.Add(this.tabMain, 0, 0); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 2; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.Size = new System.Drawing.Size(443, 225); + this.tableLayoutPanel2.TabIndex = 2; + // + // frmCheatList + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(443, 255); + this.Controls.Add(this.tableLayoutPanel2); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "frmCheatList"; + this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; + this.Text = "Cheats"; + this.Controls.SetChildIndex(this.tableLayoutPanel2, 0); + this.tabMain.ResumeLayout(false); + this.tabCheats.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); + this.contextMenuCheats.ResumeLayout(false); + this.tableLayoutPanel2.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TabControl tabMain; + private System.Windows.Forms.TabPage tabCheats; + private System.Windows.Forms.TabPage tabCheatFindTool; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.CheckBox chkCurrentGameOnly; + private MyListView lstCheats; + private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.ColumnHeader columnHeader2; + private System.Windows.Forms.ColumnHeader columnHeader3; + private System.Windows.Forms.ContextMenuStrip contextMenuCheats; + private System.Windows.Forms.ToolStripMenuItem mnuAddCheat; + private System.Windows.Forms.ToolStripMenuItem mnuDeleteCheat; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + } +} \ No newline at end of file diff --git a/GUI.NET/Forms/Cheats/frmCheatList.cs b/GUI.NET/Forms/Cheats/frmCheatList.cs new file mode 100644 index 00000000..6c49c034 --- /dev/null +++ b/GUI.NET/Forms/Cheats/frmCheatList.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Mesen.GUI.Config; + +namespace Mesen.GUI.Forms.Cheats +{ + public partial class frmCheatList : BaseConfigForm + { + public frmCheatList() + { + InitializeComponent(); + UpdateCheatList(); + } + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + Location = new Point(Owner.Location.X + (Owner.Width - Width) / 2, Owner.Location.Y + (Owner.Height - Height) / 2); + } + + private void UpdateCheatList() + { + lstCheats.Items.Clear(); + foreach(CheatInfo cheat in ConfigManager.Config.Cheats) { + ListViewItem item = lstCheats.Items.Add(cheat.GameName); + item.SubItems.AddRange(new string[] { cheat.CheatName, cheat.ToString() }); + item.Tag = cheat; + item.Checked = cheat.Enabled; + } + } + + private void mnuAddCheat_Click(object sender, EventArgs e) + { + frmCheat frm = new frmCheat(null); + if(frm.ShowDialog() == System.Windows.Forms.DialogResult.OK) { + UpdateCheatList(); + } + } + + private void lstCheats_DoubleClick(object sender, EventArgs e) + { + if(lstCheats.SelectedItems.Count == 1) { + frmCheat frm = new frmCheat((CheatInfo)lstCheats.SelectedItems[0].Tag); + if(frm.ShowDialog() == System.Windows.Forms.DialogResult.OK) { + UpdateCheatList(); + } + } + } + + private void lstCheats_ItemChecked(object sender, ItemCheckedEventArgs e) + { + if(e.Item.Tag is CheatInfo) { + ((CheatInfo)e.Item.Tag).Enabled = e.Item.Checked; + } + } + } +} diff --git a/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs b/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs index c9ec72a6..4c5fed72 100644 --- a/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs +++ b/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs @@ -30,15 +30,14 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVideoConfig)); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.txtPort = new System.Windows.Forms.TextBox(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.btnCancel = new System.Windows.Forms.Button(); - this.btnOK = new System.Windows.Forms.Button(); this.lblHost = new System.Windows.Forms.Label(); this.lblPort = new System.Windows.Forms.Label(); this.txtHost = new System.Windows.Forms.TextBox(); this.chkSpectator = new System.Windows.Forms.CheckBox(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); this.tableLayoutPanel1.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanel1 @@ -47,12 +46,10 @@ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.Controls.Add(this.txtPort, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 3); this.tableLayoutPanel1.Controls.Add(this.lblHost, 0, 0); this.tableLayoutPanel1.Controls.Add(this.lblPort, 0, 1); this.tableLayoutPanel1.Controls.Add(this.txtHost, 1, 0); this.tableLayoutPanel1.Controls.Add(this.chkSpectator, 0, 2); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 4; @@ -60,8 +57,13 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(284, 262); + this.tableLayoutPanel1.Size = new System.Drawing.Size(284, 175); this.tableLayoutPanel1.TabIndex = 1; + this.tableLayoutPanel1.Controls.SetChildIndex(this.chkSpectator, 0); + this.tableLayoutPanel1.Controls.SetChildIndex(this.txtHost, 0); + this.tableLayoutPanel1.Controls.SetChildIndex(this.lblPort, 0); + this.tableLayoutPanel1.Controls.SetChildIndex(this.lblHost, 0); + this.tableLayoutPanel1.Controls.SetChildIndex(this.txtPort, 0); // // txtPort // @@ -72,39 +74,6 @@ this.txtPort.TabIndex = 6; this.txtPort.Text = "8888"; // - // flowLayoutPanel1 - // - this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 2); - this.flowLayoutPanel1.Controls.Add(this.btnCancel); - this.flowLayoutPanel1.Controls.Add(this.btnOK); - this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 233); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(284, 29); - this.flowLayoutPanel1.TabIndex = 2; - // - // btnCancel - // - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(206, 3); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); - this.btnCancel.TabIndex = 0; - this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; - // - // btnOK - // - this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(125, 3); - this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(75, 23); - this.btnOK.TabIndex = 1; - this.btnOK.Text = "Connect"; - this.btnOK.UseVisualStyleBackColor = true; - // // lblHost // this.lblHost.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -155,9 +124,9 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "frmVideoConfig"; this.Text = "Video Options"; + this.Controls.SetChildIndex(this.tableLayoutPanel1, 0); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); - this.flowLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -166,9 +135,6 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.TextBox txtPort; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; - private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.Button btnOK; private System.Windows.Forms.Label lblHost; private System.Windows.Forms.Label lblPort; private System.Windows.Forms.TextBox txtHost; diff --git a/GUI.NET/Forms/Config/frmVideoConfig.cs b/GUI.NET/Forms/Config/frmVideoConfig.cs index a1ca9cde..c1f7f20a 100644 --- a/GUI.NET/Forms/Config/frmVideoConfig.cs +++ b/GUI.NET/Forms/Config/frmVideoConfig.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; namespace Mesen.GUI.Forms.Config { - public partial class frmVideoConfig : Form + public partial class frmVideoConfig : BaseConfigForm { public frmVideoConfig() { diff --git a/GUI.NET/Forms/NetPlay/frmClientConfig.Designer.cs b/GUI.NET/Forms/NetPlay/frmClientConfig.Designer.cs index 6a9a1843..d3a8055e 100644 --- a/GUI.NET/Forms/NetPlay/frmClientConfig.Designer.cs +++ b/GUI.NET/Forms/NetPlay/frmClientConfig.Designer.cs @@ -30,15 +30,11 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmClientConfig)); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.txtPort = new System.Windows.Forms.TextBox(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.btnCancel = new System.Windows.Forms.Button(); - this.btnOK = new System.Windows.Forms.Button(); this.lblHost = new System.Windows.Forms.Label(); this.lblPort = new System.Windows.Forms.Label(); this.txtHost = new System.Windows.Forms.TextBox(); this.chkSpectator = new System.Windows.Forms.CheckBox(); this.tableLayoutPanel1.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanel1 @@ -47,7 +43,6 @@ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.Controls.Add(this.txtPort, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 3); this.tableLayoutPanel1.Controls.Add(this.lblHost, 0, 0); this.tableLayoutPanel1.Controls.Add(this.lblPort, 0, 1); this.tableLayoutPanel1.Controls.Add(this.txtHost, 1, 0); @@ -60,7 +55,7 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(290, 140); + this.tableLayoutPanel1.Size = new System.Drawing.Size(290, 110); this.tableLayoutPanel1.TabIndex = 0; // // txtPort @@ -72,39 +67,6 @@ this.txtPort.TabIndex = 6; this.txtPort.TextChanged += new System.EventHandler(this.Field_TextChanged); // - // flowLayoutPanel1 - // - this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 2); - this.flowLayoutPanel1.Controls.Add(this.btnCancel); - this.flowLayoutPanel1.Controls.Add(this.btnOK); - this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 111); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(290, 29); - this.flowLayoutPanel1.TabIndex = 2; - // - // btnCancel - // - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(212, 3); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); - this.btnCancel.TabIndex = 0; - this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; - // - // btnOK - // - this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(131, 3); - this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(75, 23); - this.btnOK.TabIndex = 1; - this.btnOK.Text = "Connect"; - this.btnOK.UseVisualStyleBackColor = true; - // // lblHost // this.lblHost.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -148,10 +110,8 @@ // // frmClientConfig // - this.AcceptButton = this.btnOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.btnCancel; this.ClientSize = new System.Drawing.Size(290, 140); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; @@ -164,9 +124,9 @@ this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Connect..."; + this.Controls.SetChildIndex(this.tableLayoutPanel1, 0); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); - this.flowLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -175,9 +135,6 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.TextBox txtPort; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; - private System.Windows.Forms.Button btnOK; - private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Label lblHost; private System.Windows.Forms.Label lblPort; private System.Windows.Forms.TextBox txtHost; diff --git a/GUI.NET/Forms/NetPlay/frmClientConfig.cs b/GUI.NET/Forms/NetPlay/frmClientConfig.cs index 94919336..63be871e 100644 --- a/GUI.NET/Forms/NetPlay/frmClientConfig.cs +++ b/GUI.NET/Forms/NetPlay/frmClientConfig.cs @@ -8,6 +8,7 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Mesen.GUI.Config; namespace Mesen.GUI.Forms.NetPlay { diff --git a/GUI.NET/Forms/NetPlay/frmPlayerProfile.Designer.cs b/GUI.NET/Forms/NetPlay/frmPlayerProfile.Designer.cs index e8a275a3..5aeee10e 100644 --- a/GUI.NET/Forms/NetPlay/frmPlayerProfile.Designer.cs +++ b/GUI.NET/Forms/NetPlay/frmPlayerProfile.Designer.cs @@ -29,15 +29,11 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmPlayerProfile)); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.btnCancel = new System.Windows.Forms.Button(); - this.btnOK = new System.Windows.Forms.Button(); this.lblName = new System.Windows.Forms.Label(); this.lblAvatar = new System.Windows.Forms.Label(); this.txtPlayerName = new System.Windows.Forms.TextBox(); this.picAvatar = new System.Windows.Forms.PictureBox(); this.tableLayoutPanel1.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picAvatar)).BeginInit(); this.SuspendLayout(); // @@ -46,7 +42,6 @@ this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 3); this.tableLayoutPanel1.Controls.Add(this.lblName, 0, 0); this.tableLayoutPanel1.Controls.Add(this.lblAvatar, 0, 1); this.tableLayoutPanel1.Controls.Add(this.txtPlayerName, 1, 0); @@ -59,42 +54,9 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(302, 163); + this.tableLayoutPanel1.Size = new System.Drawing.Size(302, 136); this.tableLayoutPanel1.TabIndex = 1; // - // flowLayoutPanel1 - // - this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 2); - this.flowLayoutPanel1.Controls.Add(this.btnCancel); - this.flowLayoutPanel1.Controls.Add(this.btnOK); - this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 134); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(302, 29); - this.flowLayoutPanel1.TabIndex = 2; - // - // btnCancel - // - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(224, 3); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); - this.btnCancel.TabIndex = 0; - this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; - // - // btnOK - // - this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(143, 3); - this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(75, 23); - this.btnOK.TabIndex = 1; - this.btnOK.Text = "OK"; - this.btnOK.UseVisualStyleBackColor = true; - // // lblName // this.lblName.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -136,11 +98,9 @@ // // frmPlayerProfile // - this.AcceptButton = this.btnOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(302, 163); + this.ClientSize = new System.Drawing.Size(302, 136); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -149,9 +109,9 @@ this.Name = "frmPlayerProfile"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Profile"; + this.Controls.SetChildIndex(this.tableLayoutPanel1, 0); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); - this.flowLayoutPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.picAvatar)).EndInit(); this.ResumeLayout(false); @@ -160,9 +120,6 @@ #endregion private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; - private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.Button btnOK; private System.Windows.Forms.Label lblName; private System.Windows.Forms.Label lblAvatar; private System.Windows.Forms.TextBox txtPlayerName; diff --git a/GUI.NET/Forms/NetPlay/frmPlayerProfile.cs b/GUI.NET/Forms/NetPlay/frmPlayerProfile.cs index b7dd2ddd..b202e824 100644 --- a/GUI.NET/Forms/NetPlay/frmPlayerProfile.cs +++ b/GUI.NET/Forms/NetPlay/frmPlayerProfile.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Mesen.GUI.Config; namespace Mesen.GUI.Forms.NetPlay { @@ -32,13 +33,13 @@ namespace Mesen.GUI.Forms.NetPlay } } } - + /* protected override void UpdateConfig() { PlayerProfile profile = new PlayerProfile(); profile.PlayerName = this.txtPlayerName.Text; profile.SetAvatar(this.picAvatar.Image); ConfigManager.Config.Profile = profile; - } + }*/ } } diff --git a/GUI.NET/Forms/NetPlay/frmServerConfig.Designer.cs b/GUI.NET/Forms/NetPlay/frmServerConfig.Designer.cs index ea6b387e..d32015a9 100644 --- a/GUI.NET/Forms/NetPlay/frmServerConfig.Designer.cs +++ b/GUI.NET/Forms/NetPlay/frmServerConfig.Designer.cs @@ -32,9 +32,6 @@ this.txtPort = new System.Windows.Forms.TextBox(); this.lblPort = new System.Windows.Forms.Label(); this.chkPublicServer = new System.Windows.Forms.CheckBox(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.btnCancel = new System.Windows.Forms.Button(); - this.btnOK = new System.Windows.Forms.Button(); this.lblServerName = new System.Windows.Forms.Label(); this.txtServerName = new System.Windows.Forms.TextBox(); this.chkSpectator = new System.Windows.Forms.CheckBox(); @@ -43,7 +40,6 @@ this.txtPassword = new System.Windows.Forms.TextBox(); this.nudNbPlayers = new System.Windows.Forms.NumericUpDown(); this.tlpMain.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudNbPlayers)).BeginInit(); this.SuspendLayout(); // @@ -55,7 +51,6 @@ this.tlpMain.Controls.Add(this.txtPort, 1, 1); this.tlpMain.Controls.Add(this.lblPort, 0, 1); this.tlpMain.Controls.Add(this.chkPublicServer, 0, 4); - this.tlpMain.Controls.Add(this.flowLayoutPanel1, 0, 6); this.tlpMain.Controls.Add(this.lblServerName, 0, 0); this.tlpMain.Controls.Add(this.txtServerName, 1, 0); this.tlpMain.Controls.Add(this.chkSpectator, 0, 5); @@ -74,7 +69,7 @@ this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.Size = new System.Drawing.Size(302, 190); + this.tlpMain.Size = new System.Drawing.Size(302, 160); this.tlpMain.TabIndex = 1; // // txtPort @@ -109,39 +104,6 @@ this.chkPublicServer.UseVisualStyleBackColor = true; this.chkPublicServer.CheckedChanged += new System.EventHandler(this.Field_ValueChanged); // - // flowLayoutPanel1 - // - this.tlpMain.SetColumnSpan(this.flowLayoutPanel1, 2); - this.flowLayoutPanel1.Controls.Add(this.btnCancel); - this.flowLayoutPanel1.Controls.Add(this.btnOK); - this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 161); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(302, 29); - this.flowLayoutPanel1.TabIndex = 2; - // - // btnCancel - // - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(224, 3); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); - this.btnCancel.TabIndex = 0; - this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; - // - // btnOK - // - this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(143, 3); - this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(75, 23); - this.btnOK.TabIndex = 1; - this.btnOK.Text = "Start Server"; - this.btnOK.UseVisualStyleBackColor = true; - // // lblServerName // this.lblServerName.Anchor = System.Windows.Forms.AnchorStyles.Left; @@ -218,7 +180,7 @@ 0, 0}); this.nudNbPlayers.Name = "nudNbPlayers"; - this.nudNbPlayers.Size = new System.Drawing.Size(39, 20); + this.nudNbPlayers.Size = new System.Drawing.Size(35, 20); this.nudNbPlayers.TabIndex = 8; this.nudNbPlayers.Value = new decimal(new int[] { 4, @@ -229,10 +191,8 @@ // // frmServerConfig // - this.AcceptButton = this.btnOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.btnCancel; this.ClientSize = new System.Drawing.Size(302, 190); this.Controls.Add(this.tlpMain); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; @@ -242,9 +202,9 @@ this.Name = "frmServerConfig"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Server Configuration"; + this.Controls.SetChildIndex(this.tlpMain, 0); this.tlpMain.ResumeLayout(false); this.tlpMain.PerformLayout(); - this.flowLayoutPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.nudNbPlayers)).EndInit(); this.ResumeLayout(false); @@ -253,9 +213,6 @@ #endregion private System.Windows.Forms.TableLayoutPanel tlpMain; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; - private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.Button btnOK; private System.Windows.Forms.Label lblServerName; private System.Windows.Forms.Label lblMaxPlayers; private System.Windows.Forms.TextBox txtServerName; diff --git a/GUI.NET/Forms/NetPlay/frmServerConfig.cs b/GUI.NET/Forms/NetPlay/frmServerConfig.cs index f880b41c..88be4c82 100644 --- a/GUI.NET/Forms/NetPlay/frmServerConfig.cs +++ b/GUI.NET/Forms/NetPlay/frmServerConfig.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Mesen.GUI.Config; namespace Mesen.GUI.Forms.NetPlay { diff --git a/GUI.NET/Forms/frmMain.Designer.cs b/GUI.NET/Forms/frmMain.Designer.cs index f2fb936b..569d6cff 100644 --- a/GUI.NET/Forms/frmMain.Designer.cs +++ b/GUI.NET/Forms/frmMain.Designer.cs @@ -33,11 +33,15 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.mnuFile = new System.Windows.Forms.ToolStripMenuItem(); this.mnuOpen = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuSaveState = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuSaveState1 = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuLoadState = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuLoadState1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator(); this.mnuRecentFiles = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator(); this.mnuExit = new System.Windows.Forms.ToolStripMenuItem(); @@ -62,6 +66,7 @@ this.mnuDisconnect = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.mnuProfile = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuCheats = new System.Windows.Forms.ToolStripMenuItem(); this.mnuMovies = new System.Windows.Forms.ToolStripMenuItem(); this.mnuPlayMovie = new System.Windows.Forms.ToolStripMenuItem(); this.mnuRecordFrom = new System.Windows.Forms.ToolStripMenuItem(); @@ -74,11 +79,6 @@ this.mnuCheckForUpdates = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); this.mnuAbout = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuSaveState = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuLoadState = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuSaveState1 = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuLoadState1 = new System.Windows.Forms.ToolStripMenuItem(); this.dxViewer = new Mesen.GUI.Controls.DXViewer(); this.menuStrip.SuspendLayout(); this.SuspendLayout(); @@ -125,6 +125,46 @@ this.toolStripMenuItem4.Name = "toolStripMenuItem4"; this.toolStripMenuItem4.Size = new System.Drawing.Size(143, 6); // + // mnuSaveState + // + this.mnuSaveState.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuSaveState1}); + this.mnuSaveState.Name = "mnuSaveState"; + this.mnuSaveState.Size = new System.Drawing.Size(146, 22); + this.mnuSaveState.Text = "Save State"; + this.mnuSaveState.DropDownOpening += new System.EventHandler(this.mnuSaveState_DropDownOpening); + // + // mnuSaveState1 + // + this.mnuSaveState1.Font = new System.Drawing.Font("Segoe UI", 9F); + this.mnuSaveState1.Name = "mnuSaveState1"; + this.mnuSaveState1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F1))); + this.mnuSaveState1.Size = new System.Drawing.Size(187, 22); + this.mnuSaveState1.Text = "1. "; + this.mnuSaveState1.Click += new System.EventHandler(this.mnuSaveState1_Click); + // + // mnuLoadState + // + this.mnuLoadState.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuLoadState1}); + this.mnuLoadState.Name = "mnuLoadState"; + this.mnuLoadState.Size = new System.Drawing.Size(146, 22); + this.mnuLoadState.Text = "Load State"; + this.mnuLoadState.DropDownOpening += new System.EventHandler(this.mnuLoadState_DropDownOpening); + // + // mnuLoadState1 + // + this.mnuLoadState1.Name = "mnuLoadState1"; + this.mnuLoadState1.ShortcutKeys = System.Windows.Forms.Keys.F1; + this.mnuLoadState1.Size = new System.Drawing.Size(155, 22); + this.mnuLoadState1.Text = "1. "; + this.mnuLoadState1.Click += new System.EventHandler(this.mnuLoadState1_Click); + // + // toolStripMenuItem7 + // + this.toolStripMenuItem7.Name = "toolStripMenuItem7"; + this.toolStripMenuItem7.Size = new System.Drawing.Size(143, 6); + // // mnuRecentFiles // this.mnuRecentFiles.Name = "mnuRecentFiles"; @@ -158,7 +198,7 @@ this.mnuPause.Enabled = false; this.mnuPause.Name = "mnuPause"; this.mnuPause.ShortcutKeyDisplayString = "Esc"; - this.mnuPause.Size = new System.Drawing.Size(152, 22); + this.mnuPause.Size = new System.Drawing.Size(129, 22); this.mnuPause.Text = "Pause"; this.mnuPause.Click += new System.EventHandler(this.mnuPause_Click); // @@ -166,7 +206,7 @@ // this.mnuReset.Enabled = false; this.mnuReset.Name = "mnuReset"; - this.mnuReset.Size = new System.Drawing.Size(152, 22); + this.mnuReset.Size = new System.Drawing.Size(129, 22); this.mnuReset.Text = "Reset"; this.mnuReset.Click += new System.EventHandler(this.mnuReset_Click); // @@ -174,7 +214,7 @@ // this.mnuStop.Enabled = false; this.mnuStop.Name = "mnuStop"; - this.mnuStop.Size = new System.Drawing.Size(152, 22); + this.mnuStop.Size = new System.Drawing.Size(129, 22); this.mnuStop.Text = "Stop"; this.mnuStop.Click += new System.EventHandler(this.mnuStop_Click); // @@ -197,7 +237,7 @@ this.mnuLimitFPS.CheckState = System.Windows.Forms.CheckState.Checked; this.mnuLimitFPS.Name = "mnuLimitFPS"; this.mnuLimitFPS.ShortcutKeys = System.Windows.Forms.Keys.F9; - this.mnuLimitFPS.Size = new System.Drawing.Size(152, 22); + this.mnuLimitFPS.Size = new System.Drawing.Size(150, 22); this.mnuLimitFPS.Text = "Limit FPS"; this.mnuLimitFPS.Click += new System.EventHandler(this.mnuLimitFPS_Click); // @@ -205,27 +245,27 @@ // this.mnuShowFPS.Name = "mnuShowFPS"; this.mnuShowFPS.ShortcutKeys = System.Windows.Forms.Keys.F10; - this.mnuShowFPS.Size = new System.Drawing.Size(152, 22); + this.mnuShowFPS.Size = new System.Drawing.Size(150, 22); this.mnuShowFPS.Text = "Show FPS"; this.mnuShowFPS.Click += new System.EventHandler(this.mnuShowFPS_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(147, 6); // // mnuInputDevices // this.mnuInputDevices.Enabled = false; this.mnuInputDevices.Name = "mnuInputDevices"; - this.mnuInputDevices.Size = new System.Drawing.Size(152, 22); + this.mnuInputDevices.Size = new System.Drawing.Size(150, 22); this.mnuInputDevices.Text = "Input Devices"; // // mnuVideoConfig // this.mnuVideoConfig.Enabled = false; this.mnuVideoConfig.Name = "mnuVideoConfig"; - this.mnuVideoConfig.Size = new System.Drawing.Size(152, 22); + this.mnuVideoConfig.Size = new System.Drawing.Size(150, 22); this.mnuVideoConfig.Text = "Video"; this.mnuVideoConfig.Click += new System.EventHandler(this.mnuVideoConfig_Click); // @@ -233,13 +273,14 @@ // this.mnuAudioConfig.Enabled = false; this.mnuAudioConfig.Name = "mnuAudioConfig"; - this.mnuAudioConfig.Size = new System.Drawing.Size(152, 22); + this.mnuAudioConfig.Size = new System.Drawing.Size(150, 22); this.mnuAudioConfig.Text = "Audio"; // // mnuTools // this.mnuTools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuNetPlay, + this.mnuCheats, this.mnuMovies, this.mnuDebugger, this.mnuTakeScreenshot}); @@ -314,6 +355,13 @@ this.mnuProfile.Text = "Configure Profile"; this.mnuProfile.Click += new System.EventHandler(this.mnuProfile_Click); // + // mnuCheats + // + this.mnuCheats.Name = "mnuCheats"; + this.mnuCheats.Size = new System.Drawing.Size(185, 22); + this.mnuCheats.Text = "Cheats"; + this.mnuCheats.Click += new System.EventHandler(this.mnuCheats_Click); + // // mnuMovies // this.mnuMovies.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -327,7 +375,7 @@ // mnuPlayMovie // this.mnuPlayMovie.Name = "mnuPlayMovie"; - this.mnuPlayMovie.Size = new System.Drawing.Size(152, 22); + this.mnuPlayMovie.Size = new System.Drawing.Size(149, 22); this.mnuPlayMovie.Text = "Play..."; this.mnuPlayMovie.Click += new System.EventHandler(this.mnuPlayMovie_Click); // @@ -337,27 +385,27 @@ this.mnuRecordFromStart, this.mnuRecordFromNow}); this.mnuRecordFrom.Name = "mnuRecordFrom"; - this.mnuRecordFrom.Size = new System.Drawing.Size(152, 22); + this.mnuRecordFrom.Size = new System.Drawing.Size(149, 22); this.mnuRecordFrom.Text = "Record from..."; // // mnuRecordFromStart // this.mnuRecordFromStart.Name = "mnuRecordFromStart"; - this.mnuRecordFromStart.Size = new System.Drawing.Size(152, 22); + this.mnuRecordFromStart.Size = new System.Drawing.Size(99, 22); this.mnuRecordFromStart.Text = "Start"; this.mnuRecordFromStart.Click += new System.EventHandler(this.mnuRecordFromStart_Click); // // mnuRecordFromNow // this.mnuRecordFromNow.Name = "mnuRecordFromNow"; - this.mnuRecordFromNow.Size = new System.Drawing.Size(152, 22); + this.mnuRecordFromNow.Size = new System.Drawing.Size(99, 22); this.mnuRecordFromNow.Text = "Now"; this.mnuRecordFromNow.Click += new System.EventHandler(this.mnuRecordFromNow_Click); // // mnuStopMovie // this.mnuStopMovie.Name = "mnuStopMovie"; - this.mnuStopMovie.Size = new System.Drawing.Size(152, 22); + this.mnuStopMovie.Size = new System.Drawing.Size(149, 22); this.mnuStopMovie.Text = "Stop"; this.mnuStopMovie.Click += new System.EventHandler(this.mnuStopMovie_Click); // @@ -405,46 +453,6 @@ this.mnuAbout.Size = new System.Drawing.Size(170, 22); this.mnuAbout.Text = "About"; // - // toolStripMenuItem7 - // - this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(143, 6); - // - // mnuSaveState - // - this.mnuSaveState.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnuSaveState1}); - this.mnuSaveState.Name = "mnuSaveState"; - this.mnuSaveState.Size = new System.Drawing.Size(146, 22); - this.mnuSaveState.Text = "Save State"; - this.mnuSaveState.DropDownOpening += new System.EventHandler(this.mnuSaveState_DropDownOpening); - // - // mnuLoadState - // - this.mnuLoadState.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnuLoadState1}); - this.mnuLoadState.Name = "mnuLoadState"; - this.mnuLoadState.Size = new System.Drawing.Size(146, 22); - this.mnuLoadState.Text = "Load State"; - this.mnuLoadState.DropDownOpening += new System.EventHandler(this.mnuLoadState_DropDownOpening); - // - // mnuSaveState1 - // - this.mnuSaveState1.Font = new System.Drawing.Font("Segoe UI", 9F); - this.mnuSaveState1.Name = "mnuSaveState1"; - this.mnuSaveState1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F1))); - this.mnuSaveState1.Size = new System.Drawing.Size(187, 22); - this.mnuSaveState1.Text = "1. "; - this.mnuSaveState1.Click += new System.EventHandler(this.mnuSaveState1_Click); - // - // mnuLoadState1 - // - this.mnuLoadState1.Name = "mnuLoadState1"; - this.mnuLoadState1.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.mnuLoadState1.Size = new System.Drawing.Size(155, 22); - this.mnuLoadState1.Text = "1. "; - this.mnuLoadState1.Click += new System.EventHandler(this.mnuLoadState1_Click); - // // dxViewer // this.dxViewer.BackColor = System.Drawing.Color.Black; @@ -462,7 +470,6 @@ this.ClientSize = new System.Drawing.Size(365, 272); this.Controls.Add(this.dxViewer); this.Controls.Add(this.menuStrip); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip; this.Name = "frmMain"; this.Text = "Mesen"; @@ -521,6 +528,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem7; private System.Windows.Forms.ToolStripMenuItem mnuSaveState1; private System.Windows.Forms.ToolStripMenuItem mnuLoadState1; + private System.Windows.Forms.ToolStripMenuItem mnuCheats; } } diff --git a/GUI.NET/Forms/frmMain.cs b/GUI.NET/Forms/frmMain.cs index c7bf7ca4..d53d56c1 100644 --- a/GUI.NET/Forms/frmMain.cs +++ b/GUI.NET/Forms/frmMain.cs @@ -8,7 +8,9 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using Mesen.GUI.Config; using Mesen.GUI.Debugger; +using Mesen.GUI.Forms.Cheats; using Mesen.GUI.Forms.NetPlay; namespace Mesen.GUI.Forms @@ -33,6 +35,8 @@ namespace Mesen.GUI.Forms UpdateMenus(); UpdateRecentFiles(); StartRenderThread(); + + Icon = Properties.Resources.MesenIcon; } void Application_ThreadException(object sender, ThreadExceptionEventArgs e) @@ -349,5 +353,10 @@ namespace Mesen.GUI.Forms { RecordMovie(false); } + + private void mnuCheats_Click(object sender, EventArgs e) + { + new frmCheatList().Show(this); + } } } diff --git a/GUI.NET/Forms/frmMain.resx b/GUI.NET/Forms/frmMain.resx index 5b87d984..9d845151 100644 --- a/GUI.NET/Forms/frmMain.resx +++ b/GUI.NET/Forms/frmMain.resx @@ -120,293 +120,4 @@ 17, 17 - - - - AAABAAMAEBAAAAAAGABoAwAANgAAACAgAAAAABgAqAwAAJ4DAABAQAAAAAAYACgyAABGEAAAKAAAABAA - AAAgAAAAAQAYAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAANPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT0/////////////////////////7+/v7+/v///////////////////////9PT09PT - 0////////////+np6cHBwaamppubm5qamqWlpb6+vuTk5P///////////9PT09PT0/////j4+Ly8vJqa - mpqamq2trb6+vr6+vq6urpubm5qamrW1tfT09P///9PT09PT0/b29qqqqpqamry8vPDw8Pz8/Ofn5+fn - 5/z8/PPz88PDw5ubm6WlpfLy8tPT09PT07a2tpqamtbW1v///+Li4qKiopqampqamqKiouLi4v///9/f - 35ubm7Ozs9PT09PT06WlpcPDw/////T09J6enp6enqmpqZqampqamp6envT09P///8XFxaWlpdPT09PT - 0/f5/f7+/////9jY2JqamsTExO3t7ZqampqampqamtjY2P////7+//f5/dPT09PT0xxv/22i/////93d - 3ZqamsbGxu/v75qampqampqamt3d3f///2mg/xxv/9PT09PT00CG/wRg/67L//v7+6mpqbq6uuHh4Zqa - mpqamqmpqfv7+5e9/wFf/0eL/9PT09PT093q/xtv/wJf/2mg/9ji9b29vaCgoKCgoL29vc/d9FeV/wBe - /yh3/+jw/9PT09PT0////+Pt/0SJ/wBe/wJf/zR//1uX/1qX/zF8/wFf/wBe/1eV/+70/////9PT09PT - 0////////////7zU/1yY/x1w/wFf/wFf/x9x/2Kc/8jc/////////////9PT09PT0/////////////// - //////////z9//z9/////////////////////////9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT0///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAIAAAAEAAAAABABgAAAAAAAAMAAAAAAAAAAAAAAAA - AAAAAAAA09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT//////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////09PT09PT//////////////////////////////////////////////////// - ////////////////////////////////////////////////////////////////////09PT09PT//// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - /Pz84eHhycnJtra2qqqqpKSkpKSkqqqqtra2x8fH3t7e+fn5//////////////////////////////// - ////09PT09PT////////////////////////////7u7uwcHBn5+fmpqampqampqampqampqampqampqa - mpqampqampqanJycubm54+Pj////////////////////////////09PT09PT//////////////////// - 8/Pzvb29m5ubmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqasLCw6Ojo - ////////////////////09PT09PT////////////////2NjYn5+fmpqampqampqampqampqampqapqam - tbW1vb29vb29tbW1p6enmpqampqampqampqampqampqam5ubxcXF/Pz8////////////09PT09PT//// - /////f39wcHBmpqampqampqampqampqarKys1NTU8/Pz////////////////////////9vb22tratbW1 - mpqampqampqampqampqasLCw9vb2////////09PT09PT/////f39ubm5mpqampqampqampqaqqqq4eHh - ////////////////////////////////////////////////7e3tt7e3mpqampqampqampqaq6ur9/f3 - ////09PT09PT////wcHBmpqampqampqampqayMjI/Pz8////////////7e3txMTEqqqqnZ2dnZ2dqqqq - xMTE7e3t////////////////29vbn5+fmpqampqampqatLS0/v7+09PT09PT3t7empqampqampqanJyc - 3Nzc/////////////f39xsbGm5ubmpqampqampqampqampqampqam5ubxsbG/f39////////////7Ozs - o6Ojmpqampqampqa1tbW09PT09PTrKysmpqampqampqa3d3d/////////////v7+u7u7mpqampqampqa - mpqampqampqampqampqampqampqau7u7/v7+////////////6urqnZ2dmpqampqaqqqq09PT09PTnZ2d - mpqampqawcHB////////////////1dXVmpqampqampqampqampqampqampqampqampqampqampqampqa - 1dXV////////////////xcXFmpqampqanZ2d09PT09PTz8/Pm5ubqKio8/Pz/////////////v7+pKSk - mpqampqampqavLy819fXpaWlmpqampqampqampqampqampqapaWl/v7+////////////8/PzqKiom5ub - 0NDQ09PT09PT/////Pz8/v7+////////////////6+vrmpqampqampqanp6e/f39////19fXmpqampqa - mpqampqampqampqampqa6+vr/////////////////v7+/Pz8////09PT09PT////+Pr//v7///////// - ////////3t7empqampqampqaoqKi////////3d3dmpqampqampqampqampqampqampqa3t7e//////// - /////////v7/+Pr/////09PT09PTiLP/BWD/JXT/4ez/////////////4uLimpqampqampqaoqKi//// - ////3d3dmpqampqampqampqampqampqampqa4uLi////////////4ez/JXT/BWD/ibP/09PT09PTCmT/ - AF7/AF7/b6P/////////////9vb2m5ubmpqampqaoqKi////////3d3dmpqampqampqampqampqampqa - m5ub9vb2////////////Y5z/AF7/AF7/CmT/09PT09PTKnj/AF7/AF7/B2L/zN7/////////////ubm5 - mpqampqaoqKi////////3d3dmpqampqampqampqampqampqauLi4////////////qsj/AV//AF7/AF7/ - Lnr/09PT09PTmr7/AF7/AF7/AF7/F2z/0eH/////////8PDwn5+fmpqam5ub8fHx////yMjImpqampqa - mpqampqampqan5+f8PDw////////qMf/BmH/AF7/AF7/AF7/rcv/09PT09PT/f3/Qof/AF7/AF7/AF7/ - DWb/pcX/////////5eXloKCgmpqaoaGhsbGxmpqampqampqampqampqaoKCg5eXl////+fv/dqf/AV// - AF7/AF7/AF7/ZJz/////09PT09PT////7PL/Knj/AF7/AF7/AF7/AF7/Soz/0uL/////8fHxurq6m5ub - mpqampqampqampqam5uburq68fHx////tM//KXf/AF7/AF7/AF7/AF7/UI//+vz/////09PT09PT//// - ////6vH/OIH/AF7/AF7/AF7/AF7/AV//RYn/osP/6vH/9PT02trazs7Ozs7O2tra9PT04uz/k7r/L3v/ - AF7/AF7/AF7/AF7/AF7/ZJz/+vz/////////09PT09PT////////////+Pr/bqP/Al//AF7/AF7/AF7/ - AF7/AF7/AV7/InP/Ror/WJX/WZX/RYn/HnD/AF7/AF7/AF7/AF7/AF7/AF7/DWb/ncH///////////// - ////09PT09PT////////////////////xtr/OIH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/Al//WZb/4u3/////////////////////09PT09PT//////////////////// - ////////utP/UJD/BmH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/DWb/ZZ3/1OP///////// - ////////////////////09PT09PT////////////////////////////////////8PX/rMr/cqX/R4r/ - Knj/G27/G27/Knj/SYv/d6n/ttD/9vn/////////////////////////////////////09PT09PT//// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////09PT09PT//////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAQAAAAIAAAAABABgAAAAAAAAwAAAAAAAAAAAAAAAA - AAAAAAAA09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT//////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////09PT09PT//////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////////////////////09PT09PT//// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////09PT09PT//////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////09PT09PT//////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - ////////////////////////////////////////////////////////////+vr66Ojo2dnZzc3NxMTE - v7+/vLy8vLy8v7+/xcXFzc3N2NjY5ubm+Pj4//////////////////////////////////////////// - ////////////////////////////////////////////////////09PT09PT//////////////////// - ////////////////////////////////////////////////////////////+fn53d3dwsLCqqqqmpqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqapaWlvLy81dXV8vLy//////////// - ////////////////////////////////////////////////////////////////////09PT09PT//// - /////////////////////////////////////////////////////////////////Pz83Nzct7e3nJyc - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqaq6urzc3N8/Pz//////////////////////////////////////////////////////////////// - ////09PT09PT////////////////////////////////////////////////////////////9fX1ysrK - oqKimpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqam5ubtra24uLi//////////////////////////////////////// - ////////////////////09PT09PT//////////////////////////////////////////////////// - 9vb2xcXFnZ2dmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqara2t4ODg//////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - /////////f39z8/Pn5+fmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - sbGx6+vr////////////////////////////////////////////09PT09PT//////////////////// - ////////////////////6Ojoqqqqmpqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqam5ubxsbG+/v7////////////////////////////////////09PT09PT//// - /////////////////////////////f39ysrKm5ubmpqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqaoqKirq6utbW1uLi4uLi4tbW1rq6uo6Ojmpqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqaqKio6urq//////////////////////////// - ////09PT09PT////////////////////////////9fX1sbGxmpqampqampqampqampqampqampqampqa - mpqampqampqampqampqanJyctLS0z8/P5eXl+fn5////////////////////////////////+/v76enp - 1NTUvLy8oaGhmpqampqampqampqampqampqampqampqampqampqampqampqampqanJyc1tbW//////// - ////////////////////09PT09PT////////////////////////6+vrpKSkmpqampqampqampqampqa - mpqampqampqampqampqampqampqasrKy2NjY+fn5//////////////////////////////////////// - /////////////////////////v7+5eXlwsLCn5+fmpqampqampqampqampqampqampqampqampqampqa - mpqampqaxcXF/v7+////////////////////09PT09PT////////////////////5OTkn5+fmpqampqa - mpqampqampqampqampqampqampqampqam5ubvr6+7Ozs//////////////////////////////////// - ////////////////////////////////////////////////////+vr61NTUpqammpqampqampqampqa - mpqampqampqampqampqampqampqavb29/v7+////////////////09PT09PT////////////////4+Pj - nZ2dmpqampqampqampqampqampqampqampqampqampqauLi47+/v//////////////////////////// - /////////////////////////////////////////////////////////////////////////////f39 - 1dXVoqKimpqampqampqampqampqampqampqampqampqampqavb29/v7+////////////09PT09PT//// - ////////6OjonZ2dmpqampqampqampqampqampqampqampqampqapaWl4eHh//////////////////// - ////////////////////////+/v76enp3d3d19fX19fX3d3d6enp+/v7//////////////////////// - ////////////////////+fn5w8PDmpqampqampqampqampqampqampqampqampqampqaxsbG//////// - ////09PT09PT////////8vLyoaGhmpqampqampqampqampqampqampqampqampqavr6++fn5//////// - ////////////////////////////9vb20NDQsLCwm5ubmpqampqampqampqampqampqam5ubsLCw0NDQ - 9vb2////////////////////////////////////////5OTkpKSkmpqampqampqampqampqampqampqa - mpqampqa29vb////////09PT09PT/////f39rq6umpqampqampqampqampqampqampqampqanJyc19fX - ////////////////////////////////////9/f3xMTEnZ2dmpqampqampqampqampqampqampqampqa - mpqampqampqampqanZ2dxMTE9/f3////////////////////////////////////9vb2sbGxmpqampqa - mpqampqampqampqampqampqan5+f8/Pz////09PT09PT////zMzMmpqampqampqampqampqampqampqa - mpqaoKCg5ubm////////////////////////////////////39/foqKimpqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqaoqKi39/f//////////////////////////////// - /////Pz8urq6mpqampqampqampqampqampqampqampqau7u7////09PT09PT8/PznZ2dmpqampqampqa - mpqampqampqampqaoaGh7Ozs////////////////////////////////////zMzMmpqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqazMzM//////////// - /////////////////////////f39urq6mpqampqampqampqampqampqampqampqa7Ozs09PT09PTx8fH - mpqampqampqampqampqampqampqanp6e6urq////////////////////////////////////ysrKmpqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqaysrK/////////////////////////////////////Pz8sLCwmpqampqampqampqampqampqampqa - w8PD09PT09PTpaWlmpqampqampqampqampqampqampqa3t7e//////////////////////////////// - ////2dnZmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqa2dnZ////////////////////////////////////8/Pzn5+fmpqampqa - mpqampqampqampqapaWl09PT09PTm5ubmpqampqampqampqampqampqav7+///////////////////// - ////////////////8/Pznp6empqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqan5+f8/Pz//////////////////////////////// - ////zc3Nmpqampqampqampqampqampqam5ub09PT09PTrKysmpqampqampqampqampqam5ub8vLy//// - ////////////////////////////////vb29mpqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqavb29//////////////// - ////////////////////8/PzmpqampqampqampqampqampqarKys09PT09PT39/fmpqampqampqampqa - mpqawsLC////////////////////////////////////8fHxmpqampqampqampqampqampqampqampqa - mpqasLCwxcXFrq6umpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqam5ub - 8fHx////////////////////////////////////wsLCmpqampqampqampqampqa39/f09PT09PT//// - 3d3dqKiompqaoKCgysrK/f39////////////////////////////////////zMzMmpqampqampqampqa - mpqampqampqampqazs7O////////////yMjImpqampqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqazMzM/////////////////////////////////////f39ysrKoKCgmpqaqKio3d3d - ////09PT09PT////////////+/v7/v7+////////////////////////////////////////////r6+v - mpqampqampqampqampqampqampqaqqqq/////////////////f39paWlmpqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqar6+v//////////////////////////////////////////// - /v7++/v7////////////09PT09PT//////////////////////////////////////////////////// - /////////f39nJycmpqampqampqampqampqampqampqavb29////////////////////uLi4mpqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqanJyc/v7+//////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - ////////////////////////9PT0mpqampqampqampqampqampqampqampqavr6+//////////////// - ////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqa9PT0//////// - ////////////////////////////////////////////////////09PT09PT////////////+vz//f7/ - ////////////////////////////////////////7+/vmpqampqampqampqampqampqampqampqavr6+ - ////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqa7u7u/////////////////////////////////////////f7/+vz/////////////09PT09PT//// - rMn/J3X/Al7/FGn/fKr/+/z/////////////////////////////////8/Pzmpqampqampqampqampqa - mpqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqa - mpqampqampqampqampqa8/Pz////////////////////////////////+/z/e6r/FGn/Al7/KHX/rMn/ - ////09PT09PTsMv/AV7/AF7/AF7/AF7/AF7/aJ7//////////////////////////////////Pz8m5ub - mpqampqampqampqampqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqa - mpqampqampqampqampqampqampqampqam5ub/f39////////////////////////////////aJ7/AF7/ - AF7/AF7/AF7/Al//sMz/09PT09PTMHv/AF7/AF7/AF7/AF7/AF7/A1//4+3///////////////////// - ////////////rKysmpqampqampqampqampqampqampqavr6+////////////////////ubm5mpqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqarKys//////////////////////////// - ////3+r/Al7/AF7/AF7/AF7/AF7/AF7/MHv/09PT09PTBGD/AF7/AF7/AF7/AF7/AF7/AF7/hbD///// - ////////////////////////////x8fHmpqampqampqampqampqampqampqavr6+//////////////// - ////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqax8fH//////////// - ////////////////////YZr/AF7/AF7/AF7/AF7/AF7/AF7/BGD/09PT09PTHm//AF7/AF7/AF7/AF7/ - AF7/AF7/D2b/4uz/////////////////////////////7Ozsmpqampqampqampqampqampqampqavr6+ - ////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqampqampqampqampqa - 7Ozs////////////////////////////rcr/AV7/AF7/AF7/AF7/AF7/AF7/AF7/HnD/09PT09PTaZ// - AF7/AF7/AF7/AF7/AF7/AF7/AF7/OoH/+Pr/////////////////////////////tbW1mpqampqampqa - mpqampqampqavr6+////////////////////ubm5mpqampqampqampqampqampqampqampqampqampqa - mpqampqampqatbW1////////////////////////////zN7/DGX/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - dKX/09PT09PTz+D/AV7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/VZH//P3///////////////////////// - 7e3tm5ubmpqampqampqampqampqauLi4////////////////////srKympqampqampqampqampqampqa - mpqampqampqampqampqampqanJyc7e3t////////////////////////0OD/FGn/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/CWP/4+z/09PT09PT////VJH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/VZH/+fv///// - ////////////////////zs7OmpqampqampqampqampqanZ2d8vLy////////////7e3tm5ubmpqampqa - mpqampqampqampqampqampqampqampqampqampqazs7O////////////////////////wtf/EWj/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/gK3/////09PT09PT////4ez/Dmb/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/PYP/6fD//////////////////////v7+vb29mpqampqampqampqampqaqKio4+Pj+fn54ODg - paWlmpqampqampqampqampqampqampqampqampqampqampqampqavLy8/v7+//////////////////// - nL//B2L/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/NH3/+vv/////09PT09PT////////pcX/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/G27/vtX//////////////////////f39vb29mpqampqampqampqa - mpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqavb29/f39//////// - ////////8fb/Xpj/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/3+r/////////09PT09PT//// - ////////c6T/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Al//bKD/8fb///////////////////// - 0NDQnJycmpqampqampqampqampqampqampqampqampqampqampqampqampqampqampqampqanJyc0NDQ - ////////////////////ttD/H3D/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CmT/xtr///////// - ////09PT09PT/////////////f3/WZX/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/GGz/mL3/ - +/z/////////////////7u7utra2mpqampqampqampqampqampqampqampqampqampqampqampqampqa - mpqatra27u7u////////////////2OX/T47/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CWP/ - utL/////////////////09PT09PT////////////////+vz/WZT/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/InL/lbr/9Pj/////////////////6urqwsLCoqKimpqampqampqampqampqampqa - mpqampqaoqKiwsLC6urq////////////////0+L/XZf/BGD/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/DWX/vdT/////////////////////09PT09PT/////////////////////P3/bqL/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/EGf/Z53/wdb//P3//////////////v7+7e3t2tra - zs7OyMjIyMjIzs7O2tra7e3t/v7+////////////8PX/oMH/P4T/AV7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/HG7/z9//////////////////////////09PT09PT//////////////////// - ////////mL3/BmH/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/WJT/lrv/ - ytz/9fn/////////////////////////////////8fb/wdb/iLL/RIj/B2L/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/PYP/5+//////////////////////////////09PT09PT//// - ////////////////////////////zN7/JnT/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/Al7/Gm3/NH3/Ron/To7/T47/R4n/NH3/GGz/AV3/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/A1//fKv/+/z///////////////////////////// - ////09PT09PT////////////////////////////////////9Pj/cKP/Al//AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Knf/x9r///////////////////// - ////////////////////09PT09PT////////////////////////////////////////////zd7/PIP/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/Dmb/ibP/+fv///////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - /////////////v7/sc3/MXz/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/CWP/cKP/6fH/ - ////////////////////////////////////////////////////09PT09PT//////////////////// - /////////////////////////////////////v//uNH/Sov/Al7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/FWr/ - e6r/5+//////////////////////////////////////////////////////////////09PT09PT//// - ////////////////////////////////////////////////////////////////4Or/hLD/LXj/AV7/ - AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - BmH/TI3/qcf/9/r///////////////////////////////////////////////////////////////// - ////09PT09PT//////////////////////////////////////////////////////////////////// - ////////////3en/l7z/V5P/HW//AV7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/AF7/ - A17/KXb/Zp3/q8n/7/X///////////////////////////////////////////////////////////// - ////////////////////09PT09PT//////////////////////////////////////////////////// - /////////////////////////////////////////v//7PL/wtf/n8H/g6//bqL/YJn/WZT/WJT/X5n/ - bqL/hLD/osP/x9r/8fb///////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////09PT09PT//////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////////////////////09PT09PT//// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////09PT09PT//////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////09PT09PT//////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////09PT09PT//////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT - 09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PTAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - - \ No newline at end of file diff --git a/GUI.NET/GUI.NET.csproj b/GUI.NET/GUI.NET.csproj index db7cef17..c500ef88 100644 --- a/GUI.NET/GUI.NET.csproj +++ b/GUI.NET/GUI.NET.csproj @@ -39,6 +39,8 @@ + + @@ -49,13 +51,22 @@ - + + + + + + + UserControl DXViewer.cs + + Component + UserControl @@ -83,15 +94,33 @@ frmDebugger.cs + + BaseConfigForm.cs + + + Form + Form + + Form + + + frmCheat.cs + Form frmVideoConfig.cs + + Form + + + frmCheatList.cs + Form @@ -131,9 +160,18 @@ frmDebugger.cs + + BaseConfigForm.cs + + + frmCheat.cs + frmVideoConfig.cs + + frmCheatList.cs + frmMain.cs @@ -171,6 +209,7 @@ + diff --git a/GUI.NET/Properties/Resources.Designer.cs b/GUI.NET/Properties/Resources.Designer.cs index 2cd217d3..602bcfcc 100644 --- a/GUI.NET/Properties/Resources.Designer.cs +++ b/GUI.NET/Properties/Resources.Designer.cs @@ -60,6 +60,16 @@ namespace Mesen.GUI.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon MesenIcon { + get { + object obj = ResourceManager.GetObject("MesenIcon", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/GUI.NET/Properties/Resources.resx b/GUI.NET/Properties/Resources.resx index 2721d0b7..cdc6126c 100644 --- a/GUI.NET/Properties/Resources.resx +++ b/GUI.NET/Properties/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\MesenLogo.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/GUI.NET/Resources/MesenIcon.ico b/GUI.NET/Resources/MesenIcon.ico new file mode 100644 index 00000000..498c8b8f Binary files /dev/null and b/GUI.NET/Resources/MesenIcon.ico differ