diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs index e27d349756..6d16c75173 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -453,22 +453,6 @@ // FileSubMenu // this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { -<<<<<<< HEAD - this.OpenRomMenuItem, - this.RecentRomSubMenu, - this.CloseRomMenuItem, - this.toolStripMenuItem1, - this.SaveStateSubMenu, - this.LoadStateSubMenu, - this.SaveSlotSubMenu, - this.SaveRAMSubMenu, - this.toolStripMenuItem2, - this.MovieSubMenu, - this.AVSubMenu, - this.ScreenshotSubMenu, - this.toolStripSeparator4, - this.ExitMenuItem}); -======= this.OpenRomMenuItem, this.RecentRomSubMenu, this.OpenAdvancedMenuItem, @@ -484,7 +468,6 @@ this.ScreenshotSubMenu, this.toolStripSeparator4, this.ExitMenuItem}); ->>>>>>> refs/remotes/TASVideos/master this.FileSubMenu.Name = "FileSubMenu"; this.FileSubMenu.Size = new System.Drawing.Size(35, 17); this.FileSubMenu.Text = "&File"; @@ -1755,14 +1738,6 @@ // CoresSubMenu // this.CoresSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { -<<<<<<< HEAD - this.GBInSGBMenuItem, - this.NesInQuickNESMenuItem, - this.SnesWithSnes9xMenuItem, - this.gBAWithMGBAToolStripMenuItem, - this.toolStripSeparator8, - this.N64VideoPluginSettingsMenuItem}); -======= this.GBInSGBMenuItem, this.NesInQuickNESMenuItem, this.SnesWithSnes9xMenuItem, @@ -1770,7 +1745,6 @@ this.toolStripSeparator8, this.N64VideoPluginSettingsMenuItem, this.setLibretroCoreToolStripMenuItem}); ->>>>>>> refs/remotes/TASVideos/master this.CoresSubMenu.Name = "CoresSubMenu"; this.CoresSubMenu.Size = new System.Drawing.Size(165, 22); this.CoresSubMenu.Text = "Cores"; diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 1426f6783a..3e0a71bc51 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -467,7 +467,7 @@ namespace BizHawk.Client.EmuHawk CheckMessages(); LogConsole.PositionConsole(); - for (; ; ) + for (;;) { Input.Instance.Update(); @@ -714,7 +714,7 @@ namespace BizHawk.Client.EmuHawk { ControllerInputCoalescer conInput = Global.ControllerInputCoalescer as ControllerInputCoalescer; - for (; ; ) + for (;;) { // loop through all available events @@ -3505,7 +3505,7 @@ namespace BizHawk.Client.EmuHawk if (ioa is IOpenAdvancedLibretro) { var ioaretro = ioa as IOpenAdvancedLibretro; - + //prepare a core specification //if it wasnt already specified, use the current default if (ioaretro.CorePath == null) ioaretro.CorePath = Global.Config.LibretroCore; @@ -3647,11 +3647,6 @@ namespace BizHawk.Client.EmuHawk { return true; } -<<<<<<< HEAD - } - - return true; -======= HandlePlatformMenus(); _stateSlots.Clear(); @@ -3662,7 +3657,6 @@ namespace BizHawk.Client.EmuHawk SetWindowText(); return false; } ->>>>>>> refs/remotes/TASVideos/master } finally { @@ -4000,4 +3994,4 @@ namespace BizHawk.Client.EmuHawk } } -} +} \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/CDL.Designer.cs b/BizHawk.Client.EmuHawk/tools/CDL.Designer.cs index 7af730a362..7544c1a06d 100644 --- a/BizHawk.Client.EmuHawk/tools/CDL.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/CDL.Designer.cs @@ -1,245 +1,3 @@ -<<<<<<< HEAD -namespace BizHawk.Client.EmuHawk -{ - partial class CDL - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CDL)); - this.LoggingActiveCheckbox = new System.Windows.Forms.CheckBox(); - this.menuStrip1 = new MenuStripEx(); - this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.NewMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OpenMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveAsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AppendMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RecentSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.ClearMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DisassembleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CdlTextbox = new System.Windows.Forms.TextBox(); - this.menuStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // LoggingActiveCheckbox - // - this.LoggingActiveCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.LoggingActiveCheckbox.AutoSize = true; - this.LoggingActiveCheckbox.Location = new System.Drawing.Point(12, 240); - this.LoggingActiveCheckbox.Name = "LoggingActiveCheckbox"; - this.LoggingActiveCheckbox.Size = new System.Drawing.Size(107, 17); - this.LoggingActiveCheckbox.TabIndex = 1; - this.LoggingActiveCheckbox.Text = "Logging is Active"; - this.LoggingActiveCheckbox.UseVisualStyleBackColor = true; - this.LoggingActiveCheckbox.CheckedChanged += new System.EventHandler(this.LoggingActiveCheckbox_CheckedChanged); - // - // menuStrip1 - // - this.menuStrip1.ClickThrough = true; - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FileSubMenu}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(463, 24); - this.menuStrip1.TabIndex = 2; - this.menuStrip1.Text = "menuStrip1"; - // - // FileSubMenu - // - this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.NewMenuItem, - this.OpenMenuItem, - this.SaveMenuItem, - this.SaveAsMenuItem, - this.AppendMenuItem, - this.RecentSubMenu, - this.toolStripSeparator2, - this.ClearMenuItem, - this.DisassembleMenuItem, - this.toolStripSeparator1, - this.ExitMenuItem}); - this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(35, 20); - this.FileSubMenu.Text = "&File"; - this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); - // - // NewMenuItem - // - this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; - this.NewMenuItem.Name = "NewMenuItem"; - this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.NewMenuItem.Size = new System.Drawing.Size(193, 22); - this.NewMenuItem.Text = "&New"; - this.NewMenuItem.Click += new System.EventHandler(this.NewMenuItem_Click); - // - // OpenMenuItem - // - this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; - this.OpenMenuItem.Name = "OpenMenuItem"; - this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.OpenMenuItem.Size = new System.Drawing.Size(193, 22); - this.OpenMenuItem.Text = "&Open..."; - this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); - // - // SaveMenuItem - // - this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; - this.SaveMenuItem.Name = "SaveMenuItem"; - this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.SaveMenuItem.Size = new System.Drawing.Size(193, 22); - this.SaveMenuItem.Text = "&Save"; - this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click); - // - // SaveAsMenuItem - // - this.SaveAsMenuItem.Name = "SaveAsMenuItem"; - this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.S))); - this.SaveAsMenuItem.Size = new System.Drawing.Size(193, 22); - this.SaveAsMenuItem.Text = "&Save As..."; - this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click); - // - // AppendMenuItem - // - this.AppendMenuItem.Name = "AppendMenuItem"; - this.AppendMenuItem.Size = new System.Drawing.Size(193, 22); - this.AppendMenuItem.Text = "&Append File..."; - this.AppendMenuItem.Click += new System.EventHandler(this.AppendMenuItem_Click); - // - // RecentSubMenu - // - this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.noneToolStripMenuItem}); - this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; - this.RecentSubMenu.Name = "RecentSubMenu"; - this.RecentSubMenu.Size = new System.Drawing.Size(193, 22); - this.RecentSubMenu.Text = "Recent"; - this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); - // - // noneToolStripMenuItem - // - this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(99, 22); - this.noneToolStripMenuItem.Text = "None"; - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(190, 6); - // - // ClearMenuItem - // - this.ClearMenuItem.Name = "ClearMenuItem"; - this.ClearMenuItem.Size = new System.Drawing.Size(193, 22); - this.ClearMenuItem.Text = "&Clear"; - this.ClearMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click); - // - // DisassembleMenuItem - // - this.DisassembleMenuItem.Name = "DisassembleMenuItem"; - this.DisassembleMenuItem.Size = new System.Drawing.Size(193, 22); - this.DisassembleMenuItem.Text = "&Disassemble..."; - this.DisassembleMenuItem.Click += new System.EventHandler(this.DisassembleMenuItem_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(190, 6); - // - // ExitMenuItem - // - this.ExitMenuItem.Name = "ExitMenuItem"; - this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.ExitMenuItem.Size = new System.Drawing.Size(193, 22); - this.ExitMenuItem.Text = "&Close"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // - // CdlTextbox - // - this.CdlTextbox.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.CdlTextbox.Location = new System.Drawing.Point(0, 27); - this.CdlTextbox.Multiline = true; - this.CdlTextbox.Name = "CdlTextbox"; - this.CdlTextbox.ReadOnly = true; - this.CdlTextbox.Size = new System.Drawing.Size(463, 207); - this.CdlTextbox.TabIndex = 3; - // - // CDL - // - this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(463, 269); - this.Controls.Add(this.CdlTextbox); - this.Controls.Add(this.LoggingActiveCheckbox); - this.Controls.Add(this.menuStrip1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.menuStrip1; - this.MinimumSize = new System.Drawing.Size(150, 130); - this.Name = "CDL"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Code Data Logger"; - this.Load += new System.EventHandler(this.PCECDL_Load); - this.DragDrop += new System.Windows.Forms.DragEventHandler(this.PCECDL_DragDrop); - this.DragEnter += new System.Windows.Forms.DragEventHandler(this.PCECDL_DragEnter); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.CheckBox LoggingActiveCheckbox; - private MenuStripEx menuStrip1; - private System.Windows.Forms.ToolStripMenuItem FileSubMenu; - private System.Windows.Forms.ToolStripMenuItem ClearMenuItem; - private System.Windows.Forms.ToolStripMenuItem OpenMenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveAsMenuItem; - private System.Windows.Forms.ToolStripMenuItem AppendMenuItem; - private System.Windows.Forms.ToolStripMenuItem NewMenuItem; - private System.Windows.Forms.TextBox CdlTextbox; - private System.Windows.Forms.ToolStripMenuItem DisassembleMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripMenuItem ExitMenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveMenuItem; - private System.Windows.Forms.ToolStripMenuItem RecentSubMenu; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem; - - } -======= namespace BizHawk.Client.EmuHawk { partial class CDL @@ -655,5 +413,4 @@ private System.Windows.Forms.ToolStripButton tsbExportText; } ->>>>>>> refs/remotes/TASVideos/master } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/CDL.cs b/BizHawk.Client.EmuHawk/tools/CDL.cs index baec1dbd5e..ed1d802c81 100644 --- a/BizHawk.Client.EmuHawk/tools/CDL.cs +++ b/BizHawk.Client.EmuHawk/tools/CDL.cs @@ -1,395 +1,3 @@ -<<<<<<< HEAD -using System; -using System.Collections.Generic; -using System.Drawing; -using System.IO; -using System.Windows.Forms; - -using BizHawk.Emulation.Common; -using BizHawk.Emulation.Common.IEmulatorExtensions; - -using BizHawk.Emulation.Cores.Nintendo.Gameboy; -using BizHawk.Emulation.Cores.Components.H6280; -using BizHawk.Emulation.Cores.PCEngine; -using BizHawk.Emulation.Cores.Consoles.Sega; -using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; - -using BizHawk.Client.Common; -using BizHawk.Client.EmuHawk.ToolExtensions; - -namespace BizHawk.Client.EmuHawk -{ - public partial class CDL : Form, IToolFormAutoConfig - { - private RecentFiles _recent_fld = new RecentFiles(); - - [ConfigPersist] - private RecentFiles _recent - { - get - { return _recent_fld; } - set - { - _recent_fld = value; - if (_recent_fld.AutoLoad) - { - LoadFile(_recent.MostRecent); - _currentFileName = _recent.MostRecent; - } - } - } - - [RequiredService] - private IMemoryDomains MemoryDomains { get; set; } - - [RequiredService] - private ICodeDataLogger CodeDataLogger { get; set; } - - private string _currentFileName = string.Empty; - private CodeDataLog _cdl; - - public CDL() - { - InitializeComponent(); - } - - public void UpdateValues() - { - UpdateDisplay(); - } - - public void FastUpdate() - { - // Do nothing - } - - public void Restart() - { - //don't try to recover the current CDL! - //even though it seems like it might be nice, it might get mixed up between games. even if we use CheckCDL. Switching games with the same memory map will be bad. - _cdl = null; - _currentFileName = null; - LoggingActiveCheckbox.Checked = false; - UpdateDisplay(); - } - - private void UpdateDisplay() - { - if (_cdl == null) - { - CdlTextbox.Text = "No CDL loaded."; - return; - } - - StringWriter sw = new StringWriter(); - sw.WriteLine("CDL contains the following domains:"); - foreach (var kvp in _cdl) - { - int total = 0; - unsafe - { - fixed (byte* data = kvp.Value) - { - byte* src = data; - byte* end = data + kvp.Value.Length; - while (src < end) - { - if (*src++ != 0) - { - total++; - } - } - } - } - - sw.WriteLine("Domain {0} Size {1} Mapped {2}% ({3}/{4} bytes)", kvp.Key, kvp.Value.Length, total / (float)kvp.Value.Length * 100f, total, kvp.Value.Length); - } - - sw.WriteLine(); - - var bm = _cdl.GetBlockMap(); - foreach (var kvp in bm) - { - sw.WriteLine("{0:X8}: {1}", kvp.Value, kvp.Key); - } - - CdlTextbox.Text = sw.ToString(); - } - - public bool AskSaveChanges() - { - return true; - } - - public bool UpdateBefore - { - get { return false; } - } - - public void LoadFile(string path) - { - using (var fs = new FileStream(path, FileMode.Open, FileAccess.Read)) - { - var newCDL = new CodeDataLog(); - newCDL.Load(fs); - - //have the core create a CodeDataLog to check mapping information against - var testCDL = new CodeDataLog(); - CodeDataLogger.NewCDL(testCDL); - if (!newCDL.Check(testCDL)) - { - MessageBox.Show(this, "CDL file does not match emulator's current memory map!"); - return; - } - - //ok, it's all good: - _cdl = newCDL; - CodeDataLogger.SetCDL(null); - if (LoggingActiveCheckbox.Checked) - CodeDataLogger.SetCDL(_cdl); - - _currentFileName = path; - } - - UpdateDisplay(); - } - - #region Events - - #region File - - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) - { - SaveMenuItem.Enabled = !string.IsNullOrWhiteSpace(_currentFileName); - SaveAsMenuItem.Enabled = - AppendMenuItem.Enabled = - ClearMenuItem.Enabled = - DisassembleMenuItem.Enabled = - _cdl != null; - } - - private void RecentSubMenu_DropDownOpened(object sender, EventArgs e) - { - RecentSubMenu.DropDownItems.Clear(); - RecentSubMenu.DropDownItems.AddRange(_recent.RecentMenu(LoadFile, true)); - } - - void NewFileLogic() - { - _cdl = new CodeDataLog(); - CodeDataLogger.NewCDL(_cdl); - - if (LoggingActiveCheckbox.Checked) - CodeDataLogger.SetCDL(_cdl); - else CodeDataLogger.SetCDL(null); - - _currentFileName = null; - - UpdateDisplay(); - } - - private void NewMenuItem_Click(object sender, EventArgs e) - { - //take care not to clobber an existing CDL - if (_cdl != null) - { - var result = MessageBox.Show(this, "OK to create new CDL?", "Query", MessageBoxButtons.YesNo); - if (result != DialogResult.Yes) - return; - } - - NewFileLogic(); - } - - private void OpenMenuItem_Click(object sender, EventArgs e) - { - var file = ToolHelpers.OpenFileDialog( - _currentFileName, - PathManager.MakeAbsolutePath(Global.Config.PathEntries.LogPathFragment, null), - "Code Data Logger Files", - "cdl"); - - if (file == null) - return; - - //take care not to clobber an existing CDL - if (_cdl != null) - { - var result = MessageBox.Show(this, "OK to load new CDL?", "Query", MessageBoxButtons.YesNo); - if (result != DialogResult.Yes) - return; - } - - LoadFile(file.FullName); - } - - private void SaveMenuItem_Click(object sender, EventArgs e) - { - if (string.IsNullOrWhiteSpace(_currentFileName)) - { - RunSaveAs(); - return; - } - - using (var fs = new FileStream(_currentFileName, FileMode.Create, FileAccess.Write)) - { - _cdl.Save(fs); - } - } - - void RunSaveAs() - { - if (_cdl == null) - { - MessageBox.Show(this, "Cannot save with no CDL loaded!", "Alert"); - } - else - { - var file = ToolHelpers.SaveFileDialog( - _currentFileName, - PathManager.MakeAbsolutePath(Global.Config.PathEntries.LogPathFragment, null), - "Code Data Logger Files", - "cdl"); - - if (file != null) - { - using (var fs = new FileStream(file.FullName, FileMode.Create, FileAccess.Write)) - { - _cdl.Save(fs); - _recent.Add(file.FullName); - _currentFileName = file.FullName; - } - } - } - } - - private void SaveAsMenuItem_Click(object sender, EventArgs e) - { - RunSaveAs(); - } - - private void AppendMenuItem_Click(object sender, EventArgs e) - { - if (_cdl == null) - { - MessageBox.Show(this, "Cannot append with no CDL loaded!", "Alert"); - } - else - { - var file = ToolHelpers.OpenFileDialog( - _currentFileName, - PathManager.MakeAbsolutePath(Global.Config.PathEntries.LogPathFragment, null), - "Code Data Logger Files", - "cdl"); - - if (file != null) - { - using (var fs = new FileStream(file.FullName, FileMode.Open, FileAccess.Read)) - { - var newCDL = new CodeDataLog(); - newCDL.Load(fs); - if (!_cdl.Check(newCDL)) - { - MessageBox.Show(this, "CDL file does not match emulator's current memory map!"); - return; - } - _cdl.LogicalOrFrom(newCDL); - UpdateDisplay(); - } - } - } - } - - private void ClearMenuItem_Click(object sender, EventArgs e) - { - if (_cdl == null) - { - MessageBox.Show(this, "Cannot clear with no CDL loaded!", "Alert"); - } - else - { - var result = MessageBox.Show(this, "OK to clear CDL?", "Query", MessageBoxButtons.YesNo); - if (result == DialogResult.Yes) - { - _cdl.ClearData(); - UpdateDisplay(); - } - } - } - - private void DisassembleMenuItem_Click(object sender, EventArgs e) - { - if (_cdl == null) - { - MessageBox.Show(this, "Cannot disassemble with no CDL loaded!", "Alert"); - return; - } - - var sfd = new SaveFileDialog(); - var result = sfd.ShowDialog(this); - if (result == DialogResult.OK) - { - using (var fs = new FileStream(sfd.FileName, FileMode.Create, FileAccess.Write)) - { - CodeDataLogger.DisassembleCDL(fs, _cdl); - } - } - } - - private void ExitMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - - protected override void OnClosed(EventArgs e) - { - //deactivate logger - if (CodeDataLogger != null) //just in case... - CodeDataLogger.SetCDL(null); - } - - #endregion - - #region Dialog Events - - private void PCECDL_Load(object sender, EventArgs e) - { - } - - private void LoggingActiveCheckbox_CheckedChanged(object sender, EventArgs e) - { - if (LoggingActiveCheckbox.Checked && _cdl == null) - { - //implicitly create a new file - NewFileLogic(); - } - - if (_cdl != null && LoggingActiveCheckbox.Checked) - CodeDataLogger.SetCDL(_cdl); - else - CodeDataLogger.SetCDL(null); - } - - private void PCECDL_DragEnter(object sender, DragEventArgs e) - { - e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None; - } - - private void PCECDL_DragDrop(object sender, DragEventArgs e) - { - var filePaths = (string[])e.Data.GetData(DataFormats.FileDrop); - if (Path.GetExtension(filePaths[0]) == ".cdl") - { - LoadFile(filePaths[0]); - } - } - - #endregion - - #endregion - } -} -======= using System; using System.Collections.Generic; using System.Drawing; @@ -865,4 +473,3 @@ namespace BizHawk.Client.EmuHawk } } } ->>>>>>> refs/remotes/TASVideos/master diff --git a/BizHawk.Client.EmuHawk/tools/CDL.resx b/BizHawk.Client.EmuHawk/tools/CDL.resx index 04180bb397..974f328bff 100644 --- a/BizHawk.Client.EmuHawk/tools/CDL.resx +++ b/BizHawk.Client.EmuHawk/tools/CDL.resx @@ -1,204 +1,3 @@ -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - AAABAAEAICAAAAAAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAABILAAASCwAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/6qqqv+qqqr/qqqq/6qqqv+qqqr/qqqq/6qqqv+qqqr/qqqq/6qqqv+qqqr/qqqq/6qq - qv+qqqr/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAAMjIy/6qqqv+qqqr/qqqq/6qq - qv+qqqr/qqqq/6qqqv+qqqr///////////+enp7/np6e/56env+enp7/np6e/56env+enp7/np6e/56e - nv+enp7///////////+qqqr/qqqq/6qqqv+qqqr/qqqq/87Ozv/Ozs7/qqqq/zIyMv8yMjL///////// - /////////////////////////////////////////////2JiYv9iYmL/2tra/9ra2v/a2tr/2tra/9ra - 2v/a2tr/YmJi/2JiYv//////////////////////////////////////////////////////MjIy/zIy - Mv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP/a2tr/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8yMjL/MjIy/5KSkv+SkpL/////////////////kpKS/5KSkv+SkpL/kpKS/5KSkv+SkpL/kpKS/5KS - kv+SkpL/bm5u/25ubv+SkpL/kpKS/wCFAf8AhQH/kpKS/5KSkv+SkpL/kpKS/5KSkv+SkpL/kpKS/wAA - AP8AAAD/kpKS/zIyMv8yMjL/kpKS/5KSkv+SkpL/kpKS/5KSkv+SkpL/kpKS/5KSkv+SkpL/kpKS/5KS - kv+SkpL/kpKS/5KSkv9ubm7/bm5u/+bm5v+SkpL/kpKS/5KSkv+SkpL/kpKS/+bm5v/m5ub/kpKS/5KS - kv+SkpL/kpKS/5KSkv/m5ub/MjIy/zIyMv/m5ub/5ubm/+bm5v/m5ub/5ubm/+bm5v/m5ub/5ubm/+bm - 5v/m5ub/5ubm/+bm5v/m5ub/5ubm/25ubv9ubm7//////87Ozv/m5ub/5ubm/3h5ef94eXn///////// - ///m5ub/5ubm/+bm5v/m5ub/5ubm//////8yMjL/MjIy/2JiYv8lJSX///////////+enp7/np6e/56e - nv+enp7/np6e/56env///////////8DAwP/AwMD/bm5u/25ubv//////zs7O////////////eHl5//// - ////////9vr+///////m5ub///////////+qqqr//////zIyMv8yMjL//////2JiYv//////np6e/xoa - Gv8aGhr/Ghoa/xoaGv8aGhr/Ghoa/56env////////////////9ubm7/bm5u///////Ozs7///////// - //94eXn//////////////////////+bm5v///////////6qqqv//////MjIy/zIyMv+enp7/pKai/25u - bv8aGhr/Ghoa/xoaGv8aGhr/Ghoa/xoaGv8aGhr/Ghoa/25ubv+enp7/np6e/25ubv9ubm7//////87O - zv///////////3h5ef//////////////////////5ubm////////////qqqq//////8yMjL/MjIy//// - //+enp7///////////9iYmL/Pj4+/xoaGv8lJSX/Pj4+/2JiYv///////////25ubv//////bm5u/25u - bv//////zs7O////////////JSUl/yUlJf8lJSX/JSUl/yUlJf/m5ub///////////+qqqr//////zIy - Mv8yMjL//////56env//////////////////////////////////////////////////////bm5u//// - //9ubm7/bm5u///////Ozs7///////////+SkpL/kpKS/5KSkv+SkpL/kpKS/+bm5v///////////6qq - qv//////MjIy/zIyMv//////np6e/////////////////8DAwP/AwMD//////8DAwP////////////// - //9ubm7//////25ubv9ubm7//////87Ozv//////zs7O/////////////////5GO/v///////////6qq - qv//////qqqq//////8yMjL/AAAA//////+enp7///////////////////////////////////////// - /////////////25ubv//////bm5u/5KSkv//////zs7O///////Ozs7//////5GO/v+Rjv7//////5GO - /v//////qqqq//////+qqqr/kpKS/wAAAP8AAAD///////////+enp7///////////////////////// - //////////////////9ubm7///////////9ubm7/kpKS///////Ozs7////////////Ozs7///////// - /////////////6qqqv///////////6qqqv//////AAAA/wAAAP////////////////+enp7///////// - ////////////////////////bm5u/////////////////25ubv+SkpL//////87Ozv////////////// - ///Ozs7/zs7O/6qqqv+qqqr/////////////////qqqq//////8AAAD/AAAA//////////////////// - //+enp7/np6e/56env+enp7/np6e/56env//////////////////////bm5u/5KSkv//////zs7O/87O - zv/Ozs7/zs7O/87Ozv/Ozs7/zs7O/87Ozv/Ozs7/zs7O/87Ozv/Ozs7//////wAAAP8AAAD///////// - //////////////////////////////////////////////////////////////////9ubm7/kpKS//// - ////////////////////////////////////////////////////////////////////////AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/2JiYv+SkpL/Ghoa/xoaGv8aGhr/Ghoa/xoaGv8aGhr/Ghoa/xoaGv8aGhr/Ghoa/xoa - Gv8+Pj7/Pj4+/z4+Pv8+Pj7/Ghoa/z4+Pv8aGhr/Ghoa/xoaGv8aGhr/Ghoa/xoaGv8aGhr/Ghoa/xoa - Gv8aGhr/VlZW/wAAAP8AAAD/YmJi/5KSkv9WVlb/VlZW/1ZWVv9WVlb/VlZW/1ZWVv9WVlb/VlZW/1ZW - Vv8aGhr/Ghoa/xoaGv8aGhr/Ghoa/xoaGv8aGhr/Pj4+/1ZWVv9WVlb/VlZW/1ZWVv9WVlb/VlZW//2P - a/9WVlb//Y9r/xoaGv9WVlb/AAAA/wAAAP9iYmL/kpKS/1ZWVv9WVlb/VlZW/1ZWVv9WVlb/VlZW/1ZW - Vv9WVlb/VlZW/xoaGv9WVlb/VlZW/1ZWVv9WVlb/VlZW/1ZWVv8+Pj7/VlZW/1ZWVv9WVlb/VlZW/1ZW - Vv9WVlb/VlZW/1ZWVv9WVlb/Ghoa/1ZWVv8AAAD/AAAA/2JiYv+SkpL/VlZW/1ZWVv+Ghob/VlZW/4aG - hv+Ghob/hoaG/4aGhv9WVlb/Ghoa/1ZWVv9WVlb/VlZW/1ZWVv9WVlb/VlZW/z4+Pv9WVlb/VlZW/1ZW - Vv9WVlb/VlZW/1ZWVv9WVlb/VlZW/1ZWVv8aGhr/VlZW/wAAAP8AAAD/YmJi/2JiYv+SkpL/kpKS/5KS - kv+SkpL/kpKS/5KSkv+SkpL/kpKS/5KSkv9iYmL/hoaG/4aGhv+Ghob/hoaG/4aGhv+Ghob/YmJi/5KS - kv+SkpL/kpKS/5KSkv+SkpL/kpKS/5KSkv+SkpL/kpKS/25ubv9iYmL/AAAA/1ZWVv8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA - AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP9WVlb/AAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA/////////////////4AB/4AAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD///////////////8= - - -=======