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

Some warning cleanup

This commit is contained in:
adelikat 2013-02-24 20:17:12 +00:00
parent 0530547f34
commit 84bc032656
9 changed files with 380 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs
View File

@ -32,20 +32,18 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
class m4A50 : MapperBase class m4A50 : MapperBase
{ {
int myLastData = 0xFF; private int myLastData = 0xFF;
int myLastAddress = 0xFFFF; private int myLastAddress = 0xFFFF;
bool myIsRomHigh = true;
bool myBankChanged = true;
bool myIsRomLow = true;
bool myIsRomMiddle = true;
int mySliceHigh = 0;
int mySliceLow = 0;
int mySliceMiddle = 0;
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) public override byte ReadMemory(ushort addr)
{ {
@ -103,7 +101,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
if (!myIsRomLow) if (!myIsRomLow)
{ {
myRAM[(addr & 0x7ff) + mySliceLow] = value; myRAM[(addr & 0x7ff) + mySliceLow] = value;
myBankChanged = true;
} }
} }
else if (((addr & 0x1fff) >= 0x1800) && // 1.5K region at 0x1800 - 0x1dff else if (((addr & 0x1fff) >= 0x1800) && // 1.5K region at 0x1800 - 0x1dff
@ -112,7 +109,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
if (!myIsRomMiddle) if (!myIsRomMiddle)
{ {
myRAM[(addr & 0x7ff) + mySliceMiddle] = value; myRAM[(addr & 0x7ff) + mySliceMiddle] = value;
myBankChanged = true;
} }
} }
else if ((addr & 0x1f00) == 0x1e00) // 256B region at 0x1e00 - 0x1eff else if ((addr & 0x1f00) == 0x1e00) // 256B region at 0x1e00 - 0x1eff
@ -120,7 +116,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
if (!myIsRomHigh) if (!myIsRomHigh)
{ {
myRAM[(addr & 0xff) + mySliceHigh] = value; myRAM[(addr & 0xff) + mySliceHigh] = value;
myBankChanged = true;
} }
} }
else if ((addr & 0x1f00) == 0x1f00) // 256B region at 0x1f00 - 0x1fff 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) | mySliceHigh = (mySliceHigh & 0xf0ff) | ((addr & 0x8) << 8) |
((addr & 0x70) << 4); ((addr & 0x70) << 4);
myBankChanged = true;
} }
} }
} }
@ -147,57 +141,47 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
{ {
myIsRomHigh = true; myIsRomHigh = true;
mySliceHigh = (address & 0xff) << 8; mySliceHigh = (address & 0xff) << 8;
myBankChanged = true;
} }
else if ((address & 0x0f00) == 0x0d00) // Enable 256B of RAM at 0x1e00 - 0x1eff else if ((address & 0x0f00) == 0x0d00) // Enable 256B of RAM at 0x1e00 - 0x1eff
{ {
myIsRomHigh = false; myIsRomHigh = false;
mySliceHigh = (address & 0x7f) << 8; mySliceHigh = (address & 0x7f) << 8;
myBankChanged = true;
} }
else if ((address & 0x0f40) == 0x0e00) // Enable 2K of ROM at 0x1000 - 0x17ff else if ((address & 0x0f40) == 0x0e00) // Enable 2K of ROM at 0x1000 - 0x17ff
{ {
myIsRomLow = true; myIsRomLow = true;
mySliceLow = (address & 0x1f) << 11; mySliceLow = (address & 0x1f) << 11;
myBankChanged = true;
} }
else if ((address & 0x0f40) == 0x0e40) // Enable 2K of RAM at 0x1000 - 0x17ff else if ((address & 0x0f40) == 0x0e40) // Enable 2K of RAM at 0x1000 - 0x17ff
{ {
myIsRomLow = false; myIsRomLow = false;
mySliceLow = (address & 0xf) << 11; mySliceLow = (address & 0xf) << 11;
myBankChanged = true;
} }
else if ((address & 0x0f40) == 0x0f00) // Enable 1.5K of ROM at 0x1800 - 0x1dff else if ((address & 0x0f40) == 0x0f00) // Enable 1.5K of ROM at 0x1800 - 0x1dff
{ {
myIsRomMiddle = true; myIsRomMiddle = true;
mySliceMiddle = (address & 0x1f) << 11; mySliceMiddle = (address & 0x1f) << 11;
myBankChanged = true;
} }
else if ((address & 0x0f50) == 0x0f40) // Enable 1.5K of RAM at 0x1800 - 0x1dff else if ((address & 0x0f50) == 0x0f40) // Enable 1.5K of RAM at 0x1800 - 0x1dff
{ {
myIsRomMiddle = false; myIsRomMiddle = false;
mySliceMiddle = (address & 0xf) << 11; mySliceMiddle = (address & 0xf) << 11;
myBankChanged = true;
} }
else if ((address & 0x0f00) == 0x0400) // Toggle bit A11 of lower block address else if ((address & 0x0f00) == 0x0400) // Toggle bit A11 of lower block address
{ {
mySliceLow = mySliceLow ^ 0x800; mySliceLow = mySliceLow ^ 0x800;
myBankChanged = true;
} }
else if ((address & 0x0f00) == 0x0500) // Toggle bit A12 of lower block address else if ((address & 0x0f00) == 0x0500) // Toggle bit A12 of lower block address
{ {
mySliceLow = mySliceLow ^ 0x1000; mySliceLow = mySliceLow ^ 0x1000;
myBankChanged = true;
} }
else if ((address & 0x0f00) == 0x0800) // Toggle bit A11 of middle block address else if ((address & 0x0f00) == 0x0800) // Toggle bit A11 of middle block address
{ {
mySliceMiddle = mySliceMiddle ^ 0x800; mySliceMiddle = mySliceMiddle ^ 0x800;
myBankChanged = true;
} }
else if ((address & 0x0f00) == 0x0900) // Toggle bit A12 of middle block address else if ((address & 0x0f00) == 0x0900) // Toggle bit A12 of middle block address
{ {
mySliceMiddle = mySliceMiddle ^ 0x1000; mySliceMiddle = mySliceMiddle ^ 0x1000;
myBankChanged = true;
} }
// Zero-page hotspots for upper page // Zero-page hotspots for upper page
@ -208,13 +192,11 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
{ {
myIsRomHigh = true; myIsRomHigh = true;
mySliceHigh = value << 8; mySliceHigh = value << 8;
myBankChanged = true;
} }
else if ((address & 0xf75) == 0x75) // Enable 256B of RAM at 0x1e00 - 0x1eff else if ((address & 0xf75) == 0x75) // Enable 256B of RAM at 0x1e00 - 0x1eff
{ {
myIsRomHigh = false; myIsRomHigh = false;
mySliceHigh = (value & 0x7f) << 8; mySliceHigh = (value & 0x7f) << 8;
myBankChanged = true;
} }
// Zero-page hotspots for lower and middle blocks // Zero-page hotspots for lower and middle blocks
@ -226,25 +208,21 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
{ {
myIsRomLow = true; myIsRomLow = true;
mySliceLow = (value & 0xf) << 11; mySliceLow = (value & 0xf) << 11;
myBankChanged = true;
} }
else if ((value & 0xf0) == 0x40) // Enable 2K of RAM at 0x1000 - 0x17ff else if ((value & 0xf0) == 0x40) // Enable 2K of RAM at 0x1000 - 0x17ff
{ {
myIsRomLow = false; myIsRomLow = false;
mySliceLow = (value & 0xf) << 11; mySliceLow = (value & 0xf) << 11;
myBankChanged = true;
} }
else if ((value & 0xf0) == 0x90) // Enable 1.5K of ROM at 0x1800 - 0x1dff else if ((value & 0xf0) == 0x90) // Enable 1.5K of ROM at 0x1800 - 0x1dff
{ {
myIsRomMiddle = true; myIsRomMiddle = true;
mySliceMiddle = ((value & 0xf) | 0x10) << 11; mySliceMiddle = ((value & 0xf) | 0x10) << 11;
myBankChanged = true;
} }
else if ((value & 0xf0) == 0xc0) // Enable 1.5K of RAM at 0x1800 - 0x1dff else if ((value & 0xf0) == 0xc0) // Enable 1.5K of RAM at 0x1800 - 0x1dff
{ {
myIsRomMiddle = false; myIsRomMiddle = false;
mySliceMiddle = (value & 0xf) << 11; mySliceMiddle = (value & 0xf) << 11;
myBankChanged = true;
} }
} }
} }

14
BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs
View File

@ -41,7 +41,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
+---------------+---------------+ +---------------+---------------+
*/ */
public int prg_reg; public int prg_reg;
public bool low;
public int prg_bank_mask_16k; public int prg_bank_mask_16k;
public override bool Configure(NES.EDetectionOrigin origin) public override bool Configure(NES.EDetectionOrigin origin)
@ -83,17 +82,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public override byte ReadPRG(int addr) public override byte ReadPRG(int addr)
{ {
if (low) int bank = prg_reg;
{ return ROM[(bank << 14) + addr - 0x4000];
int bank = prg_reg & 0x1E;
return ROM[(bank << 14) + addr];
}
else
{
int bank = prg_reg;
return ROM[(bank << 14) + addr - 0x4000];
}
} }
} }
} }

2
BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs
View File

@ -6,6 +6,8 @@ using System.IO;
using System.Collections.Generic; using System.Collections.Generic;
using BizHawk.Emulation.CPUs.M6502; using BizHawk.Emulation.CPUs.M6502;
#pragma warning disable 162
namespace BizHawk.Emulation.Consoles.Nintendo namespace BizHawk.Emulation.Consoles.Nintendo
{ {
public partial class NES : IEmulator public partial class NES : IEmulator

2
BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
View File

@ -49,7 +49,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
class RegistrationRecord class RegistrationRecord
{ {
public object tag; public object tag;
public int scanline; public int scanline = 0;
public Action<int> callback; public Action<int> callback;
} }
} }

28
BizHawk.MultiClient/MainForm.cs
View File

@ -2009,20 +2009,20 @@ namespace BizHawk.MultiClient
break; break;
case "GB": case "GB":
case "GBC": case "GBC":
if (false) // this code will load up a dual game boy //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 // // 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 // game.System = "DGB"; // HACK
if (Global.Config.GB_ForceDMG) game.AddOption("ForceDMG"); // if (Global.Config.GB_ForceDMG) game.AddOption("ForceDMG");
if (Global.Config.GB_GBACGB) game.AddOption("GBACGB"); // if (Global.Config.GB_GBACGB) game.AddOption("GBACGB");
if (Global.Config.GB_MulticartCompat) game.AddOption("MulitcartCompat"); // if (Global.Config.GB_MulticartCompat) game.AddOption("MulitcartCompat");
GambatteLink gbl = new GambatteLink(nextComm, game, rom.FileData, game, rom.FileData); // GambatteLink gbl = new GambatteLink(nextComm, game, rom.FileData, game, rom.FileData);
nextEmulator = gbl; // nextEmulator = gbl;
// other stuff todo // // other stuff todo
} //}
else //else
{ //{
if (!Global.Config.GB_AsSGB) if (!Global.Config.GB_AsSGB)
{ {
if (Global.Config.GB_ForceDMG) game.AddOption("ForceDMG"); if (Global.Config.GB_ForceDMG) game.AddOption("ForceDMG");
@ -2084,7 +2084,7 @@ namespace BizHawk.MultiClient
snes.Load(game, rom.FileData, sgbrom, deterministicemulation); snes.Load(game, rom.FileData, sgbrom, deterministicemulation);
} }
} }
} //}
break; break;
case "Coleco": case "Coleco":
string colbiosPath = PathManager.StandardFirmwareName(Global.Config.FilenameCOLBios); string colbiosPath = PathManager.StandardFirmwareName(Global.Config.FilenameCOLBios);

4
BizHawk.MultiClient/Program.cs
View File

@ -9,13 +9,15 @@ using SlimDX.DirectSound;
using Microsoft.VisualBasic.ApplicationServices; using Microsoft.VisualBasic.ApplicationServices;
#endif #endif
#pragma warning disable 618
namespace BizHawk.MultiClient namespace BizHawk.MultiClient
{ {
static class Program static class Program
{ {
static 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 #if WINDOWS
// this will look in subdirectory "dll" to load pinvoked stuff // this will look in subdirectory "dll" to load pinvoked stuff
SetDllDirectory(System.IO.Path.Combine(PathManager.GetExeDirectoryAbsolute(), "dll")); SetDllDirectory(System.IO.Path.Combine(PathManager.GetExeDirectoryAbsolute(), "dll"));

8
BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs
View File

@ -320,7 +320,7 @@ namespace BizHawk.MultiClient
eDisplayType CurrDisplaySelection { get { return (comboDisplayType.SelectedValue as eDisplayType?).Value; } } 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) //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; Bitmap bmp = null;
System.Drawing.Imaging.BitmapData bmpdata = null; System.Drawing.Imaging.BitmapData bmpdata = null;
@ -412,7 +412,7 @@ namespace BizHawk.MultiClient
map = new SNESGraphicsDecoder.TileEntry[0]; map = new SNESGraphicsDecoder.TileEntry[0];
viewBgMode = bg.BGMode; viewBgMode = bg.BGMode;
bool handled = false; //bool handled = false;
if (bg.Enabled) if (bg.Enabled)
{ {
//TODO - directColor in normal BG renderer //TODO - directColor in normal BG renderer
@ -425,7 +425,7 @@ namespace BizHawk.MultiClient
bool mode7extbg = (bgnum == 2 && si.SETINI_Mode7ExtBG); bool mode7extbg = (bgnum == 2 && si.SETINI_Mode7ExtBG);
if (mode7 || mode7extbg) if (mode7 || mode7extbg)
{ {
handled = true; //handled = true;
allocate(1024, 1024); allocate(1024, 1024);
gd.DecodeMode7BG(pixelptr, stride / 4, mode7extbg); gd.DecodeMode7BG(pixelptr, stride / 4, mode7extbg);
numPixels = 128 * 128 * 8 * 8; numPixels = 128 * 128 * 8 * 8;
@ -438,7 +438,7 @@ namespace BizHawk.MultiClient
} }
else else
{ {
handled = true; //handled = true;
var dims = bg.ScreenSizeInPixels; var dims = bg.ScreenSizeInPixels;
dims.Height = dims.Width = Math.Max(dims.Width, dims.Height); dims.Height = dims.Width = Math.Max(dims.Width, dims.Height);
allocate(dims.Width, dims.Height); allocate(dims.Width, dims.Height);

639
BizHawk.MultiClient/tools/LuaWriter.Designer.cs generated
View File

@ -28,106 +28,106 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaWriter)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LuaWriter));
this.timer = new System.Windows.Forms.Timer(this.components); this.timer = new System.Windows.Forms.Timer(this.components);
this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.goToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.goToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.fontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.syntaxHighlightingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.syntaxHighlightingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.backgroundColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.backgroundColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.startWithEmptyScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.startWithEmptyScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.restoreSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.restoreSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MessageLabel = new System.Windows.Forms.Label(); this.MessageLabel = new System.Windows.Forms.Label();
this.AutoCompleteView = new System.Windows.Forms.ListView(); this.AutoCompleteView = new System.Windows.Forms.ListView();
this.PositionLabel = new System.Windows.Forms.Label(); this.PositionLabel = new System.Windows.Forms.Label();
this.ZoomLabel = new System.Windows.Forms.Label(); this.ZoomLabel = new System.Windows.Forms.Label();
this.LuaText = new BizHawk.MultiClient.LuaWriterBox(); this.LuaText = new BizHawk.MultiClient.LuaWriterBox();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer // timer
// //
this.timer.Enabled = true; this.timer.Enabled = true;
this.timer.Interval = 1000; this.timer.Interval = 1000;
this.timer.Tick += new System.EventHandler(this.timer_Tick); this.timer.Tick += new System.EventHandler(this.timer_Tick);
// //
// menuStrip1 // menuStrip1
// //
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem, this.fileToolStripMenuItem,
this.editToolStripMenuItem, this.editToolStripMenuItem,
this.configToolStripMenuItem}); this.configToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(474, 24); this.menuStrip1.Size = new System.Drawing.Size(474, 24);
this.menuStrip1.TabIndex = 1; this.menuStrip1.TabIndex = 1;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
// fileToolStripMenuItem // fileToolStripMenuItem
// //
this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.saveToolStripMenuItem, this.saveToolStripMenuItem,
this.saveAsToolStripMenuItem, this.saveAsToolStripMenuItem,
this.toolStripSeparator1, this.toolStripSeparator1,
this.exitToolStripMenuItem}); this.exitToolStripMenuItem});
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.fileToolStripMenuItem.Text = "&File"; this.fileToolStripMenuItem.Text = "&File";
// //
// saveToolStripMenuItem // saveToolStripMenuItem
// //
this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); 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.Size = new System.Drawing.Size(195, 22);
this.saveToolStripMenuItem.Text = "&Save"; this.saveToolStripMenuItem.Text = "&Save";
this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
// //
// saveAsToolStripMenuItem // saveAsToolStripMenuItem
// //
this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S))); | System.Windows.Forms.Keys.S)));
this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
this.saveAsToolStripMenuItem.Text = "Save &As..."; this.saveAsToolStripMenuItem.Text = "Save &As...";
this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click);
// //
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6);
// //
// exitToolStripMenuItem // exitToolStripMenuItem
// //
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4"; this.exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4";
this.exitToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.exitToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
this.exitToolStripMenuItem.Text = "E&xit"; this.exitToolStripMenuItem.Text = "E&xit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
// //
// editToolStripMenuItem // editToolStripMenuItem
// //
this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.undoToolStripMenuItem, this.undoToolStripMenuItem,
this.redoToolStripMenuItem, this.redoToolStripMenuItem,
this.toolStripSeparator2, this.toolStripSeparator2,
@ -140,241 +140,242 @@
this.searchToolStripMenuItem, this.searchToolStripMenuItem,
this.replaceToolStripMenuItem, this.replaceToolStripMenuItem,
this.goToToolStripMenuItem}); this.goToToolStripMenuItem});
this.editToolStripMenuItem.Name = "editToolStripMenuItem"; this.editToolStripMenuItem.Name = "editToolStripMenuItem";
this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
this.editToolStripMenuItem.Text = "Edit"; this.editToolStripMenuItem.Text = "Edit";
// this.editToolStripMenuItem.DropDownOpened += new System.EventHandler(this.editToolStripMenuItem_DropDownOpened);
// undoToolStripMenuItem //
// // undoToolStripMenuItem
this.undoToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo; //
this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; this.undoToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.undo;
this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); this.undoToolStripMenuItem.Name = "undoToolStripMenuItem";
this.undoToolStripMenuItem.Size = new System.Drawing.Size(164, 22); this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
this.undoToolStripMenuItem.Text = "Undo"; this.undoToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click); this.undoToolStripMenuItem.Text = "Undo";
// this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click);
// redoToolStripMenuItem //
// // redoToolStripMenuItem
this.redoToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.redo; //
this.redoToolStripMenuItem.Name = "redoToolStripMenuItem"; this.redoToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.redo;
this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); this.redoToolStripMenuItem.Name = "redoToolStripMenuItem";
this.redoToolStripMenuItem.Size = new System.Drawing.Size(164, 22); this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
this.redoToolStripMenuItem.Text = "Redo"; this.redoToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.redoToolStripMenuItem.Click += new System.EventHandler(this.redoToolStripMenuItem_Click); this.redoToolStripMenuItem.Text = "Redo";
// this.redoToolStripMenuItem.Click += new System.EventHandler(this.redoToolStripMenuItem_Click);
// toolStripSeparator2 //
// // toolStripSeparator2
this.toolStripSeparator2.Name = "toolStripSeparator2"; //
this.toolStripSeparator2.Size = new System.Drawing.Size(161, 6); this.toolStripSeparator2.Name = "toolStripSeparator2";
// this.toolStripSeparator2.Size = new System.Drawing.Size(161, 6);
// cutToolStripMenuItem //
// // cutToolStripMenuItem
this.cutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS; //
this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; this.cutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS;
this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
this.cutToolStripMenuItem.Size = new System.Drawing.Size(164, 22); this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X)));
this.cutToolStripMenuItem.Text = "Cut"; this.cutToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click); this.cutToolStripMenuItem.Text = "Cut";
// this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click);
// copyToolStripMenuItem //
// // copyToolStripMenuItem
this.copyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; //
this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate;
this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
this.copyToolStripMenuItem.Size = new System.Drawing.Size(164, 22); this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
this.copyToolStripMenuItem.Text = "Copy"; this.copyToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); this.copyToolStripMenuItem.Text = "Copy";
// this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
// pasteToolStripMenuItem //
// // pasteToolStripMenuItem
this.pasteToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Paste; //
this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; this.pasteToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Paste;
this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
this.pasteToolStripMenuItem.Size = new System.Drawing.Size(164, 22); this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
this.pasteToolStripMenuItem.Text = "Paste"; this.pasteToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click); this.pasteToolStripMenuItem.Text = "Paste";
// this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
// toolStripSeparator3 //
// // toolStripSeparator3
this.toolStripSeparator3.Name = "toolStripSeparator3"; //
this.toolStripSeparator3.Size = new System.Drawing.Size(161, 6); this.toolStripSeparator3.Name = "toolStripSeparator3";
// this.toolStripSeparator3.Size = new System.Drawing.Size(161, 6);
// selectAllToolStripMenuItem //
// // selectAllToolStripMenuItem
this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; //
this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(164, 22); this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
this.selectAllToolStripMenuItem.Text = "Select All"; this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); this.selectAllToolStripMenuItem.Text = "Select All";
// this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
// toolStripSeparator4 //
// // toolStripSeparator4
this.toolStripSeparator4.Name = "toolStripSeparator4"; //
this.toolStripSeparator4.Size = new System.Drawing.Size(161, 6); this.toolStripSeparator4.Name = "toolStripSeparator4";
// this.toolStripSeparator4.Size = new System.Drawing.Size(161, 6);
// searchToolStripMenuItem //
// // searchToolStripMenuItem
this.searchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; //
this.searchToolStripMenuItem.Name = "searchToolStripMenuItem"; this.searchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
this.searchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); this.searchToolStripMenuItem.Name = "searchToolStripMenuItem";
this.searchToolStripMenuItem.Size = new System.Drawing.Size(164, 22); this.searchToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
this.searchToolStripMenuItem.Text = "Search"; this.searchToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
// this.searchToolStripMenuItem.Text = "Search";
// replaceToolStripMenuItem //
// // replaceToolStripMenuItem
this.replaceToolStripMenuItem.Name = "replaceToolStripMenuItem"; //
this.replaceToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H))); this.replaceToolStripMenuItem.Name = "replaceToolStripMenuItem";
this.replaceToolStripMenuItem.Size = new System.Drawing.Size(164, 22); this.replaceToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H)));
this.replaceToolStripMenuItem.Text = "Replace"; this.replaceToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
// this.replaceToolStripMenuItem.Text = "Replace";
// goToToolStripMenuItem //
// // goToToolStripMenuItem
this.goToToolStripMenuItem.Name = "goToToolStripMenuItem"; //
this.goToToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); this.goToToolStripMenuItem.Name = "goToToolStripMenuItem";
this.goToToolStripMenuItem.Size = new System.Drawing.Size(164, 22); this.goToToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G)));
this.goToToolStripMenuItem.Text = "Go to..."; this.goToToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
this.goToToolStripMenuItem.Click += new System.EventHandler(this.goToToolStripMenuItem_Click); this.goToToolStripMenuItem.Text = "Go to...";
// this.goToToolStripMenuItem.Click += new System.EventHandler(this.goToToolStripMenuItem_Click);
// configToolStripMenuItem //
// // configToolStripMenuItem
this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { //
this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fontToolStripMenuItem, this.fontToolStripMenuItem,
this.syntaxHighlightingToolStripMenuItem, this.syntaxHighlightingToolStripMenuItem,
this.backgroundColorToolStripMenuItem, this.backgroundColorToolStripMenuItem,
this.toolStripSeparator5, this.toolStripSeparator5,
this.startWithEmptyScriptToolStripMenuItem, this.startWithEmptyScriptToolStripMenuItem,
this.restoreSettingsToolStripMenuItem}); this.restoreSettingsToolStripMenuItem});
this.configToolStripMenuItem.Name = "configToolStripMenuItem"; this.configToolStripMenuItem.Name = "configToolStripMenuItem";
this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 20); this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
this.configToolStripMenuItem.Text = "&Config"; this.configToolStripMenuItem.Text = "&Config";
// //
// fontToolStripMenuItem // fontToolStripMenuItem
// //
this.fontToolStripMenuItem.Name = "fontToolStripMenuItem"; this.fontToolStripMenuItem.Name = "fontToolStripMenuItem";
this.fontToolStripMenuItem.Size = new System.Drawing.Size(196, 22); this.fontToolStripMenuItem.Size = new System.Drawing.Size(196, 22);
this.fontToolStripMenuItem.Text = "&Font"; this.fontToolStripMenuItem.Text = "&Font";
this.fontToolStripMenuItem.Click += new System.EventHandler(this.fontToolStripMenuItem_Click); this.fontToolStripMenuItem.Click += new System.EventHandler(this.fontToolStripMenuItem_Click);
// //
// syntaxHighlightingToolStripMenuItem // syntaxHighlightingToolStripMenuItem
// //
this.syntaxHighlightingToolStripMenuItem.Name = "syntaxHighlightingToolStripMenuItem"; this.syntaxHighlightingToolStripMenuItem.Name = "syntaxHighlightingToolStripMenuItem";
this.syntaxHighlightingToolStripMenuItem.Size = new System.Drawing.Size(196, 22); this.syntaxHighlightingToolStripMenuItem.Size = new System.Drawing.Size(196, 22);
this.syntaxHighlightingToolStripMenuItem.Text = "&Syntax Highlighting"; this.syntaxHighlightingToolStripMenuItem.Text = "&Syntax Highlighting";
this.syntaxHighlightingToolStripMenuItem.Click += new System.EventHandler(this.syntaxHighlightingToolStripMenuItem_Click); this.syntaxHighlightingToolStripMenuItem.Click += new System.EventHandler(this.syntaxHighlightingToolStripMenuItem_Click);
// //
// backgroundColorToolStripMenuItem // backgroundColorToolStripMenuItem
// //
this.backgroundColorToolStripMenuItem.Name = "backgroundColorToolStripMenuItem"; this.backgroundColorToolStripMenuItem.Name = "backgroundColorToolStripMenuItem";
this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(196, 22); this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(196, 22);
this.backgroundColorToolStripMenuItem.Text = "Background Color"; this.backgroundColorToolStripMenuItem.Text = "Background Color";
this.backgroundColorToolStripMenuItem.Click += new System.EventHandler(this.backgroundColorToolStripMenuItem_Click); this.backgroundColorToolStripMenuItem.Click += new System.EventHandler(this.backgroundColorToolStripMenuItem_Click);
// //
// toolStripSeparator5 // toolStripSeparator5
// //
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(193, 6); this.toolStripSeparator5.Size = new System.Drawing.Size(193, 6);
// //
// startWithEmptyScriptToolStripMenuItem // startWithEmptyScriptToolStripMenuItem
// //
this.startWithEmptyScriptToolStripMenuItem.Name = "startWithEmptyScriptToolStripMenuItem"; this.startWithEmptyScriptToolStripMenuItem.Name = "startWithEmptyScriptToolStripMenuItem";
this.startWithEmptyScriptToolStripMenuItem.Size = new System.Drawing.Size(196, 22); this.startWithEmptyScriptToolStripMenuItem.Size = new System.Drawing.Size(196, 22);
this.startWithEmptyScriptToolStripMenuItem.Text = "Start With Empty Script"; this.startWithEmptyScriptToolStripMenuItem.Text = "Start With Empty Script";
this.startWithEmptyScriptToolStripMenuItem.Click += new System.EventHandler(this.startWithEmptyScriptToolStripMenuItem_Click); this.startWithEmptyScriptToolStripMenuItem.Click += new System.EventHandler(this.startWithEmptyScriptToolStripMenuItem_Click);
// //
// restoreSettingsToolStripMenuItem // restoreSettingsToolStripMenuItem
// //
this.restoreSettingsToolStripMenuItem.Name = "restoreSettingsToolStripMenuItem"; this.restoreSettingsToolStripMenuItem.Name = "restoreSettingsToolStripMenuItem";
this.restoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(196, 22); this.restoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(196, 22);
this.restoreSettingsToolStripMenuItem.Text = "Restore Settings"; this.restoreSettingsToolStripMenuItem.Text = "Restore Settings";
this.restoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.restoreSettingsToolStripMenuItem_Click); this.restoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.restoreSettingsToolStripMenuItem_Click);
// //
// MessageLabel // MessageLabel
// //
this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.MessageLabel.AutoSize = true; this.MessageLabel.AutoSize = true;
this.MessageLabel.Location = new System.Drawing.Point(15, 424); this.MessageLabel.Location = new System.Drawing.Point(15, 424);
this.MessageLabel.Name = "MessageLabel"; this.MessageLabel.Name = "MessageLabel";
this.MessageLabel.Size = new System.Drawing.Size(91, 13); this.MessageLabel.Size = new System.Drawing.Size(91, 13);
this.MessageLabel.TabIndex = 2; this.MessageLabel.TabIndex = 2;
this.MessageLabel.Text = " "; this.MessageLabel.Text = " ";
// //
// AutoCompleteView // AutoCompleteView
// //
this.AutoCompleteView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.AutoCompleteView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.AutoCompleteView.FullRowSelect = true; this.AutoCompleteView.FullRowSelect = true;
this.AutoCompleteView.HideSelection = false; this.AutoCompleteView.HideSelection = false;
this.AutoCompleteView.Location = new System.Drawing.Point(324, 322); this.AutoCompleteView.Location = new System.Drawing.Point(324, 322);
this.AutoCompleteView.MultiSelect = false; this.AutoCompleteView.MultiSelect = false;
this.AutoCompleteView.Name = "AutoCompleteView"; this.AutoCompleteView.Name = "AutoCompleteView";
this.AutoCompleteView.Size = new System.Drawing.Size(121, 97); this.AutoCompleteView.Size = new System.Drawing.Size(121, 97);
this.AutoCompleteView.TabIndex = 3; this.AutoCompleteView.TabIndex = 3;
this.AutoCompleteView.UseCompatibleStateImageBehavior = false; this.AutoCompleteView.UseCompatibleStateImageBehavior = false;
this.AutoCompleteView.View = System.Windows.Forms.View.List; this.AutoCompleteView.View = System.Windows.Forms.View.List;
this.AutoCompleteView.Visible = false; this.AutoCompleteView.Visible = false;
this.AutoCompleteView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.AutoCompleteView_MouseDoubleClick); this.AutoCompleteView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.AutoCompleteView_MouseDoubleClick);
// //
// PositionLabel // PositionLabel
// //
this.PositionLabel.AutoSize = true; this.PositionLabel.AutoSize = true;
this.PositionLabel.Location = new System.Drawing.Point(14, 30); this.PositionLabel.Location = new System.Drawing.Point(14, 30);
this.PositionLabel.Name = "PositionLabel"; this.PositionLabel.Name = "PositionLabel";
this.PositionLabel.Size = new System.Drawing.Size(46, 13); this.PositionLabel.Size = new System.Drawing.Size(46, 13);
this.PositionLabel.TabIndex = 4; this.PositionLabel.TabIndex = 4;
this.PositionLabel.Text = " "; this.PositionLabel.Text = " ";
// //
// ZoomLabel // ZoomLabel
// //
this.ZoomLabel.AutoSize = true; this.ZoomLabel.AutoSize = true;
this.ZoomLabel.Location = new System.Drawing.Point(393, 30); this.ZoomLabel.Location = new System.Drawing.Point(393, 30);
this.ZoomLabel.Name = "ZoomLabel"; this.ZoomLabel.Name = "ZoomLabel";
this.ZoomLabel.Size = new System.Drawing.Size(66, 13); this.ZoomLabel.Size = new System.Drawing.Size(66, 13);
this.ZoomLabel.TabIndex = 5; this.ZoomLabel.TabIndex = 5;
this.ZoomLabel.Text = "Zoom: 100%"; this.ZoomLabel.Text = "Zoom: 100%";
// //
// LuaText // LuaText
// //
this.LuaText.AcceptsTab = true; this.LuaText.AcceptsTab = true;
this.LuaText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 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.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.LuaText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.LuaText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.LuaText.EnableAutoDragDrop = true; this.LuaText.EnableAutoDragDrop = true;
this.LuaText.Location = new System.Drawing.Point(15, 50); this.LuaText.Location = new System.Drawing.Point(15, 50);
this.LuaText.Name = "LuaText"; this.LuaText.Name = "LuaText";
this.LuaText.Size = new System.Drawing.Size(444, 369); this.LuaText.Size = new System.Drawing.Size(444, 369);
this.LuaText.TabIndex = 0; this.LuaText.TabIndex = 0;
this.LuaText.Text = ""; this.LuaText.Text = "";
this.LuaText.WordWrap = false; this.LuaText.WordWrap = false;
this.LuaText.SelectionChanged += new System.EventHandler(this.LuaText_SelectionChanged); this.LuaText.SelectionChanged += new System.EventHandler(this.LuaText_SelectionChanged);
this.LuaText.TextChanged += new System.EventHandler(this.LuaText_TextChanged); this.LuaText.TextChanged += new System.EventHandler(this.LuaText_TextChanged);
this.LuaText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyDown); this.LuaText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyDown);
this.LuaText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyUp); this.LuaText.KeyUp += new System.Windows.Forms.KeyEventHandler(this.LuaText_KeyUp);
this.LuaText.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.LuaText_PreviewKeyDown); this.LuaText.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.LuaText_PreviewKeyDown);
// //
// LuaWriter // LuaWriter
// //
this.AllowDrop = true; this.AllowDrop = true;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(474, 441); this.ClientSize = new System.Drawing.Size(474, 441);
this.Controls.Add(this.AutoCompleteView); this.Controls.Add(this.AutoCompleteView);
this.Controls.Add(this.ZoomLabel); this.Controls.Add(this.ZoomLabel);
this.Controls.Add(this.PositionLabel); this.Controls.Add(this.PositionLabel);
this.Controls.Add(this.MessageLabel); this.Controls.Add(this.MessageLabel);
this.Controls.Add(this.LuaText); this.Controls.Add(this.LuaText);
this.Controls.Add(this.menuStrip1); this.Controls.Add(this.menuStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1; this.MainMenuStrip = this.menuStrip1;
this.Name = "LuaWriter"; this.Name = "LuaWriter";
this.Text = "LuaWriter"; this.Text = "LuaWriter";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LuaWriter_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LuaWriter_FormClosing);
this.Load += new System.EventHandler(this.LuaWriter_Load); this.Load += new System.EventHandler(this.LuaWriter_Load);
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragDrop); this.DragDrop += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragDrop);
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragEnter); this.DragEnter += new System.Windows.Forms.DragEventHandler(this.LuaWriter_DragEnter);
this.menuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout(); this.menuStrip1.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
} }

23
BizHawk.MultiClient/tools/LuaWriter.cs
View File

@ -33,6 +33,7 @@ namespace BizHawk.MultiClient
public string CurrentFile = ""; public string CurrentFile = "";
bool changes = false; bool changes = false;
bool redo = false;
bool hasChanged = false; bool hasChanged = false;
bool ProcessingText; 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"); 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) private void undoToolStripMenuItem_Click(object sender, EventArgs e)
{ {
LuaText.Undo(); LuaText.Undo();
redo = true;
} }
private void redoToolStripMenuItem_Click(object sender, EventArgs e) private void redoToolStripMenuItem_Click(object sender, EventArgs e)
@ -952,5 +954,26 @@ namespace BizHawk.MultiClient
LuaText.BackColor = col.Color; 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;
}
}
} }
} }