diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 9a6861f194..589029a8ed 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -582,9 +582,6 @@ Component - - Component - @@ -919,12 +916,6 @@ HexFind.cs - - Form - - - NewHexEditor.cs - @@ -1592,9 +1583,6 @@ HexFind.cs - - NewHexEditor.cs - LuaCanvas.cs diff --git a/BizHawk.Client.EmuHawk/CustomControls/HexView.cs b/BizHawk.Client.EmuHawk/CustomControls/HexView.cs deleted file mode 100644 index 446c41950f..0000000000 --- a/BizHawk.Client.EmuHawk/CustomControls/HexView.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Linq; -using System.Windows.Forms; - -using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.CustomControls; - -namespace BizHawk.Client.EmuHawk -{ - public class HexView : Control - { - //private readonly IControlRenderer _renderer; - private readonly Font NormalFont; - private Size _charSize; - - private long _arrayLength; - - public HexView() - { - NormalFont = new Font("Courier New", 8); // Only support fixed width - - SetStyle(ControlStyles.AllPaintingInWmPaint, true); - SetStyle(ControlStyles.UserPaint, true); - SetStyle(ControlStyles.SupportsTransparentBackColor, true); - SetStyle(ControlStyles.Opaque, true); - - //_renderer = new GdiRenderer(); - - //using (var g = CreateGraphics()) - //using (var LCK = _renderer.LockGraphics(g)) - //{ - // _charSize = _renderer.MeasureString("A", NormalFont); // TODO make this a property so changing it updates other values. - //} - } - - protected override void Dispose(bool disposing) - { - //_renderer.Dispose(); - - NormalFont.Dispose(); - - base.Dispose(disposing); - } - - #region Paint - - protected override void OnPaint(PaintEventArgs e) - { - //using (var lck = _renderer.LockGraphics(e.Graphics)) - //{ - // _renderer.StartOffScreenBitmap(Width, Height); - - // // White Background - // _renderer.SetBrush(Color.White); - // _renderer.SetSolidPen(Color.White); - // _renderer.FillRectangle(0, 0, Width, Height); - - - // _renderer.DrawString("Hello World", new Point(10, 10)); - - // _renderer.CopyToScreen(); - // _renderer.EndOffScreenBitmap(); - //} - } - - #endregion - - #region Properties - - /// - /// Gets or sets the sets the virtual number of the length of the array to display - /// - [Category("Behavior")] - public long ArrayLength - { - get - { - return _arrayLength; - } - - set - { - _arrayLength = value; - RecalculateScrollBars(); - } - } - - #endregion - - #region Event Handlers - - [Category("Virtual")] - public event QueryIndexValueHandler QueryIndexValue; - - [Category("Virtual")] - public event QueryIndexBkColorHandler QueryIndexBgColor; - - [Category("Virtual")] - public event QueryIndexForeColorHandler QueryIndexForeColor; - - public delegate void QueryIndexValueHandler(int index, out long value); - - public delegate void QueryIndexBkColorHandler(int index, ref Color color); - - public delegate void QueryIndexForeColorHandler(int index, ref Color color); - - #endregion - - private void RecalculateScrollBars() - { - } - } -} diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs index af23e02304..2999c02b63 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -233,8 +233,6 @@ this.externalToolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dummyExternalTool = new System.Windows.Forms.ToolStripMenuItem(); this.batchRunnerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ExperimentalToolsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.NewHexEditorMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NESSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.coreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.quickNESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -2098,8 +2096,7 @@ this.toolStripSeparator29, this.MultiDiskBundlerFileMenuItem, this.externalToolToolStripMenuItem, - this.batchRunnerToolStripMenuItem, - this.ExperimentalToolsSubMenu}); + this.batchRunnerToolStripMenuItem}); this.ToolsSubMenu.Name = "ToolsSubMenu"; this.ToolsSubMenu.Size = new System.Drawing.Size(47, 19); this.ToolsSubMenu.Text = "&Tools"; @@ -2261,22 +2258,6 @@ this.batchRunnerToolStripMenuItem.Visible = false; this.batchRunnerToolStripMenuItem.Click += new System.EventHandler(this.BatchRunnerToolStripMenuItem_Click); // - // ExperimentalToolsSubMenu - // - this.ExperimentalToolsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.NewHexEditorMenuItem}); - this.ExperimentalToolsSubMenu.Name = "ExperimentalToolsSubMenu"; - this.ExperimentalToolsSubMenu.Size = new System.Drawing.Size(191, 22); - this.ExperimentalToolsSubMenu.Text = "Experimental Tools"; - this.ExperimentalToolsSubMenu.DropDownOpened += new System.EventHandler(this.ExperimentalToolsSubMenu_DropDownOpened); - // - // NewHexEditorMenuItem - // - this.NewHexEditorMenuItem.Name = "NewHexEditorMenuItem"; - this.NewHexEditorMenuItem.Size = new System.Drawing.Size(155, 22); - this.NewHexEditorMenuItem.Text = "New Hex Editor"; - this.NewHexEditorMenuItem.Click += new System.EventHandler(this.NewHexEditorMenuItem_Click); - // // NESSubMenu // this.NESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -4738,8 +4719,6 @@ private System.Windows.Forms.ToolStripMenuItem gameSharkConverterToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem dummyExternalTool; private System.Windows.Forms.ToolStripMenuItem RecordAVMenuItem; - private System.Windows.Forms.ToolStripMenuItem ExperimentalToolsSubMenu; - private System.Windows.Forms.ToolStripMenuItem NewHexEditorMenuItem; private System.Windows.Forms.ToolStripMenuItem SaveConfigAsMenuItem; private System.Windows.Forms.ToolStripMenuItem LoadConfigFromMenuItem; private System.Windows.Forms.ToolStripMenuItem SaveMovieAsMenuItem; diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 381a9ff917..79c1f23088 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1394,8 +1394,6 @@ namespace BizHawk.Client.EmuHawk BasicBotMenuItem.Enabled = GlobalWin.Tools.IsAvailable(); gameSharkConverterToolStripMenuItem.Enabled = GlobalWin.Tools.IsAvailable(); - - ExperimentalToolsSubMenu.Visible = VersionInfo.DeveloperBuild; } private void ExternalToolToolStripMenuItem_DropDownOpening(object sender, EventArgs e) @@ -1425,11 +1423,6 @@ namespace BizHawk.Client.EmuHawk } } - private void ExperimentalToolsSubMenu_DropDownOpened(object sender, EventArgs e) - { - NewHexEditorMenuItem.Enabled = GlobalWin.Tools.IsAvailable(); - } - private void ToolBoxMenuItem_Click(object sender, EventArgs e) { GlobalWin.Tools.Load(); @@ -1524,11 +1517,6 @@ namespace BizHawk.Client.EmuHawk form.ShowDialog(); } - private void NewHexEditorMenuItem_Click(object sender, EventArgs e) - { - GlobalWin.Tools.Load(); - } - #endregion #region NES diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/NewHexEditor.Designer.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/NewHexEditor.Designer.cs deleted file mode 100644 index d6074c0358..0000000000 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/NewHexEditor.Designer.cs +++ /dev/null @@ -1,102 +0,0 @@ -namespace BizHawk.Client.EmuHawk -{ - partial class NewHexEditor - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.HexMenu = new System.Windows.Forms.MenuStrip(); - this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.HexViewControl = new BizHawk.Client.EmuHawk.HexView(); - this.HexMenu.SuspendLayout(); - this.SuspendLayout(); - // - // HexMenu - // - this.HexMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FileSubMenu}); - this.HexMenu.Location = new System.Drawing.Point(0, 0); - this.HexMenu.Name = "HexMenu"; - this.HexMenu.Size = new System.Drawing.Size(448, 24); - this.HexMenu.TabIndex = 0; - this.HexMenu.Text = "menuStrip1"; - // - // FileSubMenu - // - this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ExitMenuItem}); - this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(37, 20); - this.FileSubMenu.Text = "&File"; - this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); - // - // ExitMenuItem - // - this.ExitMenuItem.Name = "ExitMenuItem"; - this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.ExitMenuItem.Size = new System.Drawing.Size(134, 22); - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // - // HexViewControl - // - this.HexViewControl.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.HexViewControl.ArrayLength = 0; - this.HexViewControl.Location = new System.Drawing.Point(12, 27); - this.HexViewControl.Name = "HexViewControl"; - this.HexViewControl.Size = new System.Drawing.Size(424, 231); - this.HexViewControl.TabIndex = 1; - this.HexViewControl.Text = "hexView1"; - // - // NewHexEditor - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(448, 270); - this.Controls.Add(this.HexViewControl); - this.Controls.Add(this.HexMenu); - this.MainMenuStrip = this.HexMenu; - this.Name = "NewHexEditor"; - this.Text = "NewHexEditor"; - this.Load += new System.EventHandler(this.NewHexEditor_Load); - this.HexMenu.ResumeLayout(false); - this.HexMenu.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.MenuStrip HexMenu; - private System.Windows.Forms.ToolStripMenuItem FileSubMenu; - private System.Windows.Forms.ToolStripMenuItem ExitMenuItem; - private HexView HexViewControl; - } -} \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/NewHexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/NewHexEditor.cs deleted file mode 100644 index 3a5570d819..0000000000 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/NewHexEditor.cs +++ /dev/null @@ -1,105 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Windows.Forms; - -using BizHawk.Emulation.Common; - -namespace BizHawk.Client.EmuHawk -{ - public partial class NewHexEditor : Form, IToolFormAutoConfig - { - #region Initialize and Dependencies - - [RequiredService] - private IMemoryDomains MemoryDomains { get; set; } - - [RequiredService] - private IEmulator Emulator { get; set; } - - public NewHexEditor() - { - InitializeComponent(); - - Closing += (o, e) => SaveConfigSettings(); - - HexViewControl.QueryIndexValue += HexView_QueryIndexValue; - HexViewControl.QueryIndexForeColor += HexView_QueryIndexForeColor; - HexViewControl.QueryIndexBgColor += HexView_QueryIndexForeColor; - } - - private void NewHexEditor_Load(object sender, EventArgs e) - { - HexViewControl.ArrayLength = MemoryDomains.MainMemory.Size; - } - - private void SaveConfigSettings() - { - - } - - #endregion - - #region IToolForm implementation - - public void NewUpdate(ToolFormUpdateType type) { } - - public void UpdateValues() - { - // TODO - } - - public void FastUpdate() - { - // TODO - } - - public void Restart() - { - // TODO - } - - public bool AskSaveChanges() - { - return true; // TODO - } - - public bool UpdateBefore { get { return false; } } - - #endregion - - #region HexView Callbacks - - private void HexView_QueryIndexValue(int index, out long value) - { - value = MemoryDomains.MainMemory.PeekByte(index); - } - - private void HexView_QueryIndexBgColor(int index, ref Color color) - { - color = Color.White; - } - - private void HexView_QueryIndexForeColor(int index, ref Color color) - { - color = Color.Black; - } - - #endregion - - #region Menu Items - - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) - { - - } - - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - - #endregion - } -} diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/NewHexEditor.resx b/BizHawk.Client.EmuHawk/tools/HexEditor/NewHexEditor.resx deleted file mode 100644 index 9a68370371..0000000000 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/NewHexEditor.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs index 23c3a8df8c..3b98fc6d4c 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs @@ -69,8 +69,6 @@ namespace BizHawk.Client.EmuHawk continue; // if (!ApiInjector.IsAvailable(, t)) // continue; - if (t == typeof(HexView) && OSTailoredCode.CurrentOS != OSTailoredCode.DistinctOS.Windows) - continue; // Skip this tool on Unix. It isn't finished and only causes exceptions var instance = Activator.CreateInstance(t);