From 84bc032656662f8fae8a97e59e79eb5027b53daf Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 24 Feb 2013 20:17:12 +0000 Subject: [PATCH] Some warning cleanup --- .../Consoles/Atari/2600/Mappers/m4A50.cs | 44 +- .../Consoles/Nintendo/NES/Boards/Mapper231.cs | 14 +- .../Consoles/Nintendo/NES/Core.cs | 2 + .../Consoles/Nintendo/SNES/LibsnesCore.cs | 2 +- BizHawk.MultiClient/MainForm.cs | 28 +- BizHawk.MultiClient/Program.cs | 4 +- .../SNESTools/SNESGraphicsDebugger.cs | 8 +- .../tools/LuaWriter.Designer.cs | 639 +++++++++--------- BizHawk.MultiClient/tools/LuaWriter.cs | 23 + 9 files changed, 380 insertions(+), 384 deletions(-) diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs index 72970bcb46..ef9cb7aac2 100644 --- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs +++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs @@ -32,20 +32,18 @@ namespace BizHawk.Emulation.Consoles.Atari._2600 class m4A50 : MapperBase { - int myLastData = 0xFF; - int myLastAddress = 0xFFFF; - - bool myIsRomHigh = true; - bool myBankChanged = true; - bool myIsRomLow = true; - bool myIsRomMiddle = true; - - int mySliceHigh = 0; - int mySliceLow = 0; - int mySliceMiddle = 0; + private int myLastData = 0xFF; + private int myLastAddress = 0xFFFF; - ByteBuffer myRAM = new ByteBuffer(32768); - + private bool myIsRomHigh = true; + private bool myIsRomLow = true; + private bool myIsRomMiddle = true; + + private int mySliceHigh = 0; + private int mySliceLow = 0; + private int mySliceMiddle = 0; + + private ByteBuffer myRAM = new ByteBuffer(32768); public override byte ReadMemory(ushort addr) { @@ -103,7 +101,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600 if (!myIsRomLow) { myRAM[(addr & 0x7ff) + mySliceLow] = value; - myBankChanged = true; } } else if (((addr & 0x1fff) >= 0x1800) && // 1.5K region at 0x1800 - 0x1dff @@ -112,7 +109,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600 if (!myIsRomMiddle) { myRAM[(addr & 0x7ff) + mySliceMiddle] = value; - myBankChanged = true; } } else if ((addr & 0x1f00) == 0x1e00) // 256B region at 0x1e00 - 0x1eff @@ -120,7 +116,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600 if (!myIsRomHigh) { myRAM[(addr & 0xff) + mySliceHigh] = value; - myBankChanged = true; } } else if ((addr & 0x1f00) == 0x1f00) // 256B region at 0x1f00 - 0x1fff @@ -130,7 +125,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600 { mySliceHigh = (mySliceHigh & 0xf0ff) | ((addr & 0x8) << 8) | ((addr & 0x70) << 4); - myBankChanged = true; } } } @@ -147,57 +141,47 @@ namespace BizHawk.Emulation.Consoles.Atari._2600 { myIsRomHigh = true; mySliceHigh = (address & 0xff) << 8; - myBankChanged = true; } else if ((address & 0x0f00) == 0x0d00) // Enable 256B of RAM at 0x1e00 - 0x1eff { myIsRomHigh = false; mySliceHigh = (address & 0x7f) << 8; - myBankChanged = true; } else if ((address & 0x0f40) == 0x0e00) // Enable 2K of ROM at 0x1000 - 0x17ff { myIsRomLow = true; mySliceLow = (address & 0x1f) << 11; - myBankChanged = true; } else if ((address & 0x0f40) == 0x0e40) // Enable 2K of RAM at 0x1000 - 0x17ff { myIsRomLow = false; mySliceLow = (address & 0xf) << 11; - myBankChanged = true; } else if ((address & 0x0f40) == 0x0f00) // Enable 1.5K of ROM at 0x1800 - 0x1dff { myIsRomMiddle = true; mySliceMiddle = (address & 0x1f) << 11; - myBankChanged = true; } else if ((address & 0x0f50) == 0x0f40) // Enable 1.5K of RAM at 0x1800 - 0x1dff { myIsRomMiddle = false; mySliceMiddle = (address & 0xf) << 11; - myBankChanged = true; } else if ((address & 0x0f00) == 0x0400) // Toggle bit A11 of lower block address { mySliceLow = mySliceLow ^ 0x800; - myBankChanged = true; } else if ((address & 0x0f00) == 0x0500) // Toggle bit A12 of lower block address { mySliceLow = mySliceLow ^ 0x1000; - myBankChanged = true; } else if ((address & 0x0f00) == 0x0800) // Toggle bit A11 of middle block address { mySliceMiddle = mySliceMiddle ^ 0x800; - myBankChanged = true; } else if ((address & 0x0f00) == 0x0900) // Toggle bit A12 of middle block address { mySliceMiddle = mySliceMiddle ^ 0x1000; - myBankChanged = true; } // Zero-page hotspots for upper page @@ -208,13 +192,11 @@ namespace BizHawk.Emulation.Consoles.Atari._2600 { myIsRomHigh = true; mySliceHigh = value << 8; - myBankChanged = true; } else if ((address & 0xf75) == 0x75) // Enable 256B of RAM at 0x1e00 - 0x1eff { myIsRomHigh = false; mySliceHigh = (value & 0x7f) << 8; - myBankChanged = true; } // Zero-page hotspots for lower and middle blocks @@ -226,25 +208,21 @@ namespace BizHawk.Emulation.Consoles.Atari._2600 { myIsRomLow = true; mySliceLow = (value & 0xf) << 11; - myBankChanged = true; } else if ((value & 0xf0) == 0x40) // Enable 2K of RAM at 0x1000 - 0x17ff { myIsRomLow = false; mySliceLow = (value & 0xf) << 11; - myBankChanged = true; } else if ((value & 0xf0) == 0x90) // Enable 1.5K of ROM at 0x1800 - 0x1dff { myIsRomMiddle = true; mySliceMiddle = ((value & 0xf) | 0x10) << 11; - myBankChanged = true; } else if ((value & 0xf0) == 0xc0) // Enable 1.5K of RAM at 0x1800 - 0x1dff { myIsRomMiddle = false; mySliceMiddle = (value & 0xf) << 11; - myBankChanged = true; } } } diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs index 50e4cb65f7..747d8109df 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs @@ -41,7 +41,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo +---------------+---------------+ */ public int prg_reg; - public bool low; public int prg_bank_mask_16k; public override bool Configure(NES.EDetectionOrigin origin) @@ -83,17 +82,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo public override byte ReadPRG(int addr) { - if (low) - { - int bank = prg_reg & 0x1E; - return ROM[(bank << 14) + addr]; - } - else - { - int bank = prg_reg; - return ROM[(bank << 14) + addr - 0x4000]; - - } + int bank = prg_reg; + return ROM[(bank << 14) + addr - 0x4000]; } } } diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs index 92006a6152..c1aa25b8e8 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs @@ -6,6 +6,8 @@ using System.IO; using System.Collections.Generic; using BizHawk.Emulation.CPUs.M6502; +#pragma warning disable 162 + namespace BizHawk.Emulation.Consoles.Nintendo { public partial class NES : IEmulator diff --git a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs index bba2fcb787..f151be9d73 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs @@ -49,7 +49,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES class RegistrationRecord { public object tag; - public int scanline; + public int scanline = 0; public Action callback; } } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 959836bf15..5c6d8ea35d 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -2009,20 +2009,20 @@ namespace BizHawk.MultiClient break; case "GB": case "GBC": - if (false) // this code will load up a dual game boy - { - // this is horrible. we MUST decide when we should be using Game.System and when we should be using Emulator.SystemID - game.System = "DGB"; // HACK + //if (false) // this code will load up a dual game boy + //{ + // // this is horrible. we MUST decide when we should be using Game.System and when we should be using Emulator.SystemID + // game.System = "DGB"; // HACK - if (Global.Config.GB_ForceDMG) game.AddOption("ForceDMG"); - if (Global.Config.GB_GBACGB) game.AddOption("GBACGB"); - if (Global.Config.GB_MulticartCompat) game.AddOption("MulitcartCompat"); - GambatteLink gbl = new GambatteLink(nextComm, game, rom.FileData, game, rom.FileData); - nextEmulator = gbl; - // other stuff todo - } - else - { + // if (Global.Config.GB_ForceDMG) game.AddOption("ForceDMG"); + // if (Global.Config.GB_GBACGB) game.AddOption("GBACGB"); + // if (Global.Config.GB_MulticartCompat) game.AddOption("MulitcartCompat"); + // GambatteLink gbl = new GambatteLink(nextComm, game, rom.FileData, game, rom.FileData); + // nextEmulator = gbl; + // // other stuff todo + //} + //else + //{ if (!Global.Config.GB_AsSGB) { if (Global.Config.GB_ForceDMG) game.AddOption("ForceDMG"); @@ -2084,7 +2084,7 @@ namespace BizHawk.MultiClient snes.Load(game, rom.FileData, sgbrom, deterministicemulation); } } - } + //} break; case "Coleco": string colbiosPath = PathManager.StandardFirmwareName(Global.Config.FilenameCOLBios); diff --git a/BizHawk.MultiClient/Program.cs b/BizHawk.MultiClient/Program.cs index aa399dc640..6960386ade 100644 --- a/BizHawk.MultiClient/Program.cs +++ b/BizHawk.MultiClient/Program.cs @@ -9,13 +9,15 @@ using SlimDX.DirectSound; using Microsoft.VisualBasic.ApplicationServices; #endif +#pragma warning disable 618 + namespace BizHawk.MultiClient { static class Program { static Program() { - http://www.codeproject.com/Articles/310675/AppDomain-AssemblyResolve-Event-Tips + //http://www.codeproject.com/Articles/310675/AppDomain-AssemblyResolve-Event-Tips #if WINDOWS // this will look in subdirectory "dll" to load pinvoked stuff SetDllDirectory(System.IO.Path.Combine(PathManager.GetExeDirectoryAbsolute(), "dll")); diff --git a/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs b/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs index dd43583319..3aa1d2ea78 100644 --- a/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs +++ b/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs @@ -320,7 +320,7 @@ namespace BizHawk.MultiClient eDisplayType CurrDisplaySelection { get { return (comboDisplayType.SelectedValue as eDisplayType?).Value; } } //todo - something smarter to cycle through bitmaps without repeatedly trashing them (use the dispose callback on the viewer) - void RenderView() + private void RenderView() { Bitmap bmp = null; System.Drawing.Imaging.BitmapData bmpdata = null; @@ -412,7 +412,7 @@ namespace BizHawk.MultiClient map = new SNESGraphicsDecoder.TileEntry[0]; viewBgMode = bg.BGMode; - bool handled = false; + //bool handled = false; if (bg.Enabled) { //TODO - directColor in normal BG renderer @@ -425,7 +425,7 @@ namespace BizHawk.MultiClient bool mode7extbg = (bgnum == 2 && si.SETINI_Mode7ExtBG); if (mode7 || mode7extbg) { - handled = true; + //handled = true; allocate(1024, 1024); gd.DecodeMode7BG(pixelptr, stride / 4, mode7extbg); numPixels = 128 * 128 * 8 * 8; @@ -438,7 +438,7 @@ namespace BizHawk.MultiClient } else { - handled = true; + //handled = true; var dims = bg.ScreenSizeInPixels; dims.Height = dims.Width = Math.Max(dims.Width, dims.Height); allocate(dims.Width, dims.Height); diff --git a/BizHawk.MultiClient/tools/LuaWriter.Designer.cs b/BizHawk.MultiClient/tools/LuaWriter.Designer.cs index 5038478999..f835a5b5e1 100644 --- a/BizHawk.MultiClient/tools/LuaWriter.Designer.cs +++ b/BizHawk.MultiClient/tools/LuaWriter.Designer.cs @@ -28,106 +28,106 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaWriter)); - this.timer = new System.Windows.Forms.Timer(this.components); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.goToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.syntaxHighlightingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.backgroundColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.startWithEmptyScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.restoreSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MessageLabel = new System.Windows.Forms.Label(); - this.AutoCompleteView = new System.Windows.Forms.ListView(); - this.PositionLabel = new System.Windows.Forms.Label(); - this.ZoomLabel = new System.Windows.Forms.Label(); - this.LuaText = new BizHawk.MultiClient.LuaWriterBox(); - this.menuStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // timer - // - this.timer.Enabled = true; - this.timer.Interval = 1000; - this.timer.Tick += new System.EventHandler(this.timer_Tick); - // - // menuStrip1 - // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaWriter)); + this.timer = new System.Windows.Forms.Timer(this.components); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.goToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.syntaxHighlightingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backgroundColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.startWithEmptyScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.restoreSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MessageLabel = new System.Windows.Forms.Label(); + this.AutoCompleteView = new System.Windows.Forms.ListView(); + this.PositionLabel = new System.Windows.Forms.Label(); + this.ZoomLabel = new System.Windows.Forms.Label(); + this.LuaText = new BizHawk.MultiClient.LuaWriterBox(); + this.menuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // timer + // + this.timer.Enabled = true; + this.timer.Interval = 1000; + this.timer.Tick += new System.EventHandler(this.timer_Tick); + // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.editToolStripMenuItem, this.configToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(474, 24); - this.menuStrip1.TabIndex = 1; - this.menuStrip1.Text = "menuStrip1"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(474, 24); + this.menuStrip1.TabIndex = 1; + this.menuStrip1.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.saveToolStripMenuItem, this.saveAsToolStripMenuItem, this.toolStripSeparator1, this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); - this.fileToolStripMenuItem.Text = "&File"; - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.saveToolStripMenuItem.Text = "&Save"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // saveAsToolStripMenuItem - // - this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Text = "&File"; + // + // saveToolStripMenuItem + // + this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.saveToolStripMenuItem.Text = "&Save"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + // + // saveAsToolStripMenuItem + // + this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; + this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.saveAsToolStripMenuItem.Text = "Save &As..."; - this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(195, 22); - this.exitToolStripMenuItem.Text = "E&xit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // editToolStripMenuItem - // - this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.saveAsToolStripMenuItem.Text = "Save &As..."; + this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4"; + this.exitToolStripMenuItem.Size = new System.Drawing.Size(195, 22); + this.exitToolStripMenuItem.Text = "E&xit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // editToolStripMenuItem + // + this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.undoToolStripMenuItem, this.redoToolStripMenuItem, this.toolStripSeparator2, @@ -140,241 +140,242 @@ this.searchToolStripMenuItem, this.replaceToolStripMenuItem, this.goToToolStripMenuItem}); - this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); - this.editToolStripMenuItem.Text = "Edit"; - // - // undoToolStripMenuItem - // - this.undoToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo; - this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; - this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); - this.undoToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.undoToolStripMenuItem.Text = "Undo"; - this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click); - // - // redoToolStripMenuItem - // - this.redoToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.redo; - this.redoToolStripMenuItem.Name = "redoToolStripMenuItem"; - this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); - this.redoToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.redoToolStripMenuItem.Text = "Redo"; - this.redoToolStripMenuItem.Click += new System.EventHandler(this.redoToolStripMenuItem_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(161, 6); - // - // cutToolStripMenuItem - // - this.cutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; - this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; - this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); - this.cutToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.cutToolStripMenuItem.Text = "Cut"; - this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click); - // - // copyToolStripMenuItem - // - this.copyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; - this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.copyToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.copyToolStripMenuItem.Text = "Copy"; - this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); - // - // pasteToolStripMenuItem - // - this.pasteToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Paste; - this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; - this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); - this.pasteToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.pasteToolStripMenuItem.Text = "Paste"; - this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(161, 6); - // - // selectAllToolStripMenuItem - // - this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; - this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.selectAllToolStripMenuItem.Text = "Select All"; - this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(161, 6); - // - // searchToolStripMenuItem - // - this.searchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; - this.searchToolStripMenuItem.Name = "searchToolStripMenuItem"; - this.searchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.searchToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.searchToolStripMenuItem.Text = "Search"; - // - // replaceToolStripMenuItem - // - this.replaceToolStripMenuItem.Name = "replaceToolStripMenuItem"; - this.replaceToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H))); - this.replaceToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.replaceToolStripMenuItem.Text = "Replace"; - // - // goToToolStripMenuItem - // - this.goToToolStripMenuItem.Name = "goToToolStripMenuItem"; - this.goToToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); - this.goToToolStripMenuItem.Size = new System.Drawing.Size(164, 22); - this.goToToolStripMenuItem.Text = "Go to..."; - this.goToToolStripMenuItem.Click += new System.EventHandler(this.goToToolStripMenuItem_Click); - // - // configToolStripMenuItem - // - this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.editToolStripMenuItem.Name = "editToolStripMenuItem"; + this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + this.editToolStripMenuItem.Text = "Edit"; + this.editToolStripMenuItem.DropDownOpened += new System.EventHandler(this.editToolStripMenuItem_DropDownOpened); + // + // undoToolStripMenuItem + // + this.undoToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo; + this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; + this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); + this.undoToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.undoToolStripMenuItem.Text = "Undo"; + this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click); + // + // redoToolStripMenuItem + // + this.redoToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.redo; + this.redoToolStripMenuItem.Name = "redoToolStripMenuItem"; + this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); + this.redoToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.redoToolStripMenuItem.Text = "Redo"; + this.redoToolStripMenuItem.Click += new System.EventHandler(this.redoToolStripMenuItem_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(161, 6); + // + // cutToolStripMenuItem + // + this.cutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; + this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; + this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); + this.cutToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.cutToolStripMenuItem.Text = "Cut"; + this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click); + // + // copyToolStripMenuItem + // + this.copyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; + this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; + this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.copyToolStripMenuItem.Text = "Copy"; + this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); + // + // pasteToolStripMenuItem + // + this.pasteToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Paste; + this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; + this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); + this.pasteToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.pasteToolStripMenuItem.Text = "Paste"; + this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(161, 6); + // + // selectAllToolStripMenuItem + // + this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; + this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.selectAllToolStripMenuItem.Text = "Select All"; + this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(161, 6); + // + // searchToolStripMenuItem + // + this.searchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.searchToolStripMenuItem.Name = "searchToolStripMenuItem"; + this.searchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); + this.searchToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.searchToolStripMenuItem.Text = "Search"; + // + // replaceToolStripMenuItem + // + this.replaceToolStripMenuItem.Name = "replaceToolStripMenuItem"; + this.replaceToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H))); + this.replaceToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.replaceToolStripMenuItem.Text = "Replace"; + // + // goToToolStripMenuItem + // + this.goToToolStripMenuItem.Name = "goToToolStripMenuItem"; + this.goToToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); + this.goToToolStripMenuItem.Size = new System.Drawing.Size(164, 22); + this.goToToolStripMenuItem.Text = "Go to..."; + this.goToToolStripMenuItem.Click += new System.EventHandler(this.goToToolStripMenuItem_Click); + // + // configToolStripMenuItem + // + this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fontToolStripMenuItem, this.syntaxHighlightingToolStripMenuItem, this.backgroundColorToolStripMenuItem, this.toolStripSeparator5, this.startWithEmptyScriptToolStripMenuItem, this.restoreSettingsToolStripMenuItem}); - this.configToolStripMenuItem.Name = "configToolStripMenuItem"; - this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 20); - this.configToolStripMenuItem.Text = "&Config"; - // - // fontToolStripMenuItem - // - this.fontToolStripMenuItem.Name = "fontToolStripMenuItem"; - this.fontToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.fontToolStripMenuItem.Text = "&Font"; - this.fontToolStripMenuItem.Click += new System.EventHandler(this.fontToolStripMenuItem_Click); - // - // syntaxHighlightingToolStripMenuItem - // - this.syntaxHighlightingToolStripMenuItem.Name = "syntaxHighlightingToolStripMenuItem"; - this.syntaxHighlightingToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.syntaxHighlightingToolStripMenuItem.Text = "&Syntax Highlighting"; - this.syntaxHighlightingToolStripMenuItem.Click += new System.EventHandler(this.syntaxHighlightingToolStripMenuItem_Click); - // - // backgroundColorToolStripMenuItem - // - this.backgroundColorToolStripMenuItem.Name = "backgroundColorToolStripMenuItem"; - this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.backgroundColorToolStripMenuItem.Text = "Background Color"; - this.backgroundColorToolStripMenuItem.Click += new System.EventHandler(this.backgroundColorToolStripMenuItem_Click); - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(193, 6); - // - // startWithEmptyScriptToolStripMenuItem - // - this.startWithEmptyScriptToolStripMenuItem.Name = "startWithEmptyScriptToolStripMenuItem"; - this.startWithEmptyScriptToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.startWithEmptyScriptToolStripMenuItem.Text = "Start With Empty Script"; - this.startWithEmptyScriptToolStripMenuItem.Click += new System.EventHandler(this.startWithEmptyScriptToolStripMenuItem_Click); - // - // restoreSettingsToolStripMenuItem - // - this.restoreSettingsToolStripMenuItem.Name = "restoreSettingsToolStripMenuItem"; - this.restoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.restoreSettingsToolStripMenuItem.Text = "Restore Settings"; - this.restoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.restoreSettingsToolStripMenuItem_Click); - // - // MessageLabel - // - this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.MessageLabel.AutoSize = true; - this.MessageLabel.Location = new System.Drawing.Point(15, 424); - this.MessageLabel.Name = "MessageLabel"; - this.MessageLabel.Size = new System.Drawing.Size(91, 13); - this.MessageLabel.TabIndex = 2; - this.MessageLabel.Text = " "; - // - // AutoCompleteView - // - this.AutoCompleteView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.AutoCompleteView.FullRowSelect = true; - this.AutoCompleteView.HideSelection = false; - this.AutoCompleteView.Location = new System.Drawing.Point(324, 322); - this.AutoCompleteView.MultiSelect = false; - this.AutoCompleteView.Name = "AutoCompleteView"; - this.AutoCompleteView.Size = new System.Drawing.Size(121, 97); - this.AutoCompleteView.TabIndex = 3; - this.AutoCompleteView.UseCompatibleStateImageBehavior = false; - this.AutoCompleteView.View = System.Windows.Forms.View.List; - this.AutoCompleteView.Visible = false; - this.AutoCompleteView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.AutoCompleteView_MouseDoubleClick); - // - // PositionLabel - // - this.PositionLabel.AutoSize = true; - this.PositionLabel.Location = new System.Drawing.Point(14, 30); - this.PositionLabel.Name = "PositionLabel"; - this.PositionLabel.Size = new System.Drawing.Size(46, 13); - this.PositionLabel.TabIndex = 4; - this.PositionLabel.Text = " "; - // - // ZoomLabel - // - this.ZoomLabel.AutoSize = true; - this.ZoomLabel.Location = new System.Drawing.Point(393, 30); - this.ZoomLabel.Name = "ZoomLabel"; - this.ZoomLabel.Size = new System.Drawing.Size(66, 13); - this.ZoomLabel.TabIndex = 5; - this.ZoomLabel.Text = "Zoom: 100%"; - // - // LuaText - // - this.LuaText.AcceptsTab = true; - this.LuaText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.configToolStripMenuItem.Name = "configToolStripMenuItem"; + this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 20); + this.configToolStripMenuItem.Text = "&Config"; + // + // fontToolStripMenuItem + // + this.fontToolStripMenuItem.Name = "fontToolStripMenuItem"; + this.fontToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.fontToolStripMenuItem.Text = "&Font"; + this.fontToolStripMenuItem.Click += new System.EventHandler(this.fontToolStripMenuItem_Click); + // + // syntaxHighlightingToolStripMenuItem + // + this.syntaxHighlightingToolStripMenuItem.Name = "syntaxHighlightingToolStripMenuItem"; + this.syntaxHighlightingToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.syntaxHighlightingToolStripMenuItem.Text = "&Syntax Highlighting"; + this.syntaxHighlightingToolStripMenuItem.Click += new System.EventHandler(this.syntaxHighlightingToolStripMenuItem_Click); + // + // backgroundColorToolStripMenuItem + // + this.backgroundColorToolStripMenuItem.Name = "backgroundColorToolStripMenuItem"; + this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.backgroundColorToolStripMenuItem.Text = "Background Color"; + this.backgroundColorToolStripMenuItem.Click += new System.EventHandler(this.backgroundColorToolStripMenuItem_Click); + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(193, 6); + // + // startWithEmptyScriptToolStripMenuItem + // + this.startWithEmptyScriptToolStripMenuItem.Name = "startWithEmptyScriptToolStripMenuItem"; + this.startWithEmptyScriptToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.startWithEmptyScriptToolStripMenuItem.Text = "Start With Empty Script"; + this.startWithEmptyScriptToolStripMenuItem.Click += new System.EventHandler(this.startWithEmptyScriptToolStripMenuItem_Click); + // + // restoreSettingsToolStripMenuItem + // + this.restoreSettingsToolStripMenuItem.Name = "restoreSettingsToolStripMenuItem"; + this.restoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.restoreSettingsToolStripMenuItem.Text = "Restore Settings"; + this.restoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.restoreSettingsToolStripMenuItem_Click); + // + // MessageLabel + // + this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.MessageLabel.AutoSize = true; + this.MessageLabel.Location = new System.Drawing.Point(15, 424); + this.MessageLabel.Name = "MessageLabel"; + this.MessageLabel.Size = new System.Drawing.Size(91, 13); + this.MessageLabel.TabIndex = 2; + this.MessageLabel.Text = " "; + // + // AutoCompleteView + // + this.AutoCompleteView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.AutoCompleteView.FullRowSelect = true; + this.AutoCompleteView.HideSelection = false; + this.AutoCompleteView.Location = new System.Drawing.Point(324, 322); + this.AutoCompleteView.MultiSelect = false; + this.AutoCompleteView.Name = "AutoCompleteView"; + this.AutoCompleteView.Size = new System.Drawing.Size(121, 97); + this.AutoCompleteView.TabIndex = 3; + this.AutoCompleteView.UseCompatibleStateImageBehavior = false; + this.AutoCompleteView.View = System.Windows.Forms.View.List; + this.AutoCompleteView.Visible = false; + this.AutoCompleteView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.AutoCompleteView_MouseDoubleClick); + // + // PositionLabel + // + this.PositionLabel.AutoSize = true; + this.PositionLabel.Location = new System.Drawing.Point(14, 30); + this.PositionLabel.Name = "PositionLabel"; + this.PositionLabel.Size = new System.Drawing.Size(46, 13); + this.PositionLabel.TabIndex = 4; + this.PositionLabel.Text = " "; + // + // ZoomLabel + // + this.ZoomLabel.AutoSize = true; + this.ZoomLabel.Location = new System.Drawing.Point(393, 30); + this.ZoomLabel.Name = "ZoomLabel"; + this.ZoomLabel.Size = new System.Drawing.Size(66, 13); + this.ZoomLabel.TabIndex = 5; + this.ZoomLabel.Text = "Zoom: 100%"; + // + // LuaText + // + this.LuaText.AcceptsTab = true; + this.LuaText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.LuaText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.LuaText.EnableAutoDragDrop = true; - this.LuaText.Location = new System.Drawing.Point(15, 50); - this.LuaText.Name = "LuaText"; - this.LuaText.Size = new System.Drawing.Size(444, 369); - this.LuaText.TabIndex = 0; - this.LuaText.Text = ""; - this.LuaText.WordWrap = false; - this.LuaText.SelectionChanged += new System.EventHandler(this.LuaText_SelectionChanged); - this.LuaText.TextChanged += new System.EventHandler(this.LuaText_TextChanged); - this.LuaText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyDown); - this.LuaText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyUp); - this.LuaText.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.LuaText_PreviewKeyDown); - // - // LuaWriter - // - this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(474, 441); - this.Controls.Add(this.AutoCompleteView); - this.Controls.Add(this.ZoomLabel); - this.Controls.Add(this.PositionLabel); - this.Controls.Add(this.MessageLabel); - this.Controls.Add(this.LuaText); - this.Controls.Add(this.menuStrip1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.menuStrip1; - this.Name = "LuaWriter"; - this.Text = "LuaWriter"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LuaWriter_FormClosing); - this.Load += new System.EventHandler(this.LuaWriter_Load); - this.DragDrop += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragDrop); - this.DragEnter += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragEnter); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.LuaText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.LuaText.EnableAutoDragDrop = true; + this.LuaText.Location = new System.Drawing.Point(15, 50); + this.LuaText.Name = "LuaText"; + this.LuaText.Size = new System.Drawing.Size(444, 369); + this.LuaText.TabIndex = 0; + this.LuaText.Text = ""; + this.LuaText.WordWrap = false; + this.LuaText.SelectionChanged += new System.EventHandler(this.LuaText_SelectionChanged); + this.LuaText.TextChanged += new System.EventHandler(this.LuaText_TextChanged); + this.LuaText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyDown); + this.LuaText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyUp); + this.LuaText.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.LuaText_PreviewKeyDown); + // + // LuaWriter + // + this.AllowDrop = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(474, 441); + this.Controls.Add(this.AutoCompleteView); + this.Controls.Add(this.ZoomLabel); + this.Controls.Add(this.PositionLabel); + this.Controls.Add(this.MessageLabel); + this.Controls.Add(this.LuaText); + this.Controls.Add(this.menuStrip1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MainMenuStrip = this.menuStrip1; + this.Name = "LuaWriter"; + this.Text = "LuaWriter"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LuaWriter_FormClosing); + this.Load += new System.EventHandler(this.LuaWriter_Load); + this.DragDrop += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragDrop); + this.DragEnter += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragEnter); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/BizHawk.MultiClient/tools/LuaWriter.cs b/BizHawk.MultiClient/tools/LuaWriter.cs index eaf727c267..d309e72b9f 100644 --- a/BizHawk.MultiClient/tools/LuaWriter.cs +++ b/BizHawk.MultiClient/tools/LuaWriter.cs @@ -33,6 +33,7 @@ namespace BizHawk.MultiClient public string CurrentFile = ""; bool changes = false; + bool redo = false; bool hasChanged = false; bool ProcessingText; public Regex keyWords = new Regex("and|break|do|else|if|end|false|for|function|in|local|nil|not|or|repeat|return|then|true|until|while|elseif"); @@ -932,6 +933,7 @@ namespace BizHawk.MultiClient private void undoToolStripMenuItem_Click(object sender, EventArgs e) { LuaText.Undo(); + redo = true; } private void redoToolStripMenuItem_Click(object sender, EventArgs e) @@ -952,5 +954,26 @@ namespace BizHawk.MultiClient LuaText.BackColor = col.Color; } } + + private void editToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + if (changes) + { + undoToolStripMenuItem.Enabled = true; + } + else + { + undoToolStripMenuItem.Enabled = false; + } + + if (redo) + { + redoToolStripMenuItem.Enabled = true; + } + else + { + redoToolStripMenuItem.Enabled = false; + } + } } } \ No newline at end of file