From 0cc27a226be29fc1e03a10205ffea80c19bafc2b Mon Sep 17 00:00:00 2001 From: zeromus Date: Sat, 7 May 2016 10:10:26 -0500 Subject: [PATCH] add auto-start and auto-save to CDL; fix toolbar to be ToolStripEx, so it doesnt suck --- BizHawk.Client.Common/config/Config.cs | 1 + BizHawk.Client.EmuHawk/tools/CDL.Designer.cs | 714 ++++++++++--------- BizHawk.Client.EmuHawk/tools/CDL.cs | 136 +++- BizHawk.Client.EmuHawk/tools/CDL.resx | 351 +++++---- 4 files changed, 640 insertions(+), 562 deletions(-) diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs index d79c22e67e..fdbc56a702 100644 --- a/BizHawk.Client.Common/config/Config.cs +++ b/BizHawk.Client.Common/config/Config.cs @@ -127,6 +127,7 @@ namespace BizHawk.Client.Common public DateTime? Update_LastCheckTimeUTC = null; public string Update_LatestVersion = ""; public string Update_IgnoreVersion = ""; + public bool CDLAutoSave = true, CDLAutoStart = true; //public bool TurboSeek = true; // When PauseOnFrame is set, this will decide whether the client goes into turbo mode or not diff --git a/BizHawk.Client.EmuHawk/tools/CDL.Designer.cs b/BizHawk.Client.EmuHawk/tools/CDL.Designer.cs index 7544c1a06d..30e56b8b42 100644 --- a/BizHawk.Client.EmuHawk/tools/CDL.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/CDL.Designer.cs @@ -28,350 +28,368 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CDL)); - 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.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.tsbLoggingActive = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.tsbViewUpdate = new System.Windows.Forms.ToolStripButton(); - this.tsbViewStyle = new System.Windows.Forms.ToolStripComboBox(); - this.lvCDL = new BizHawk.Client.EmuHawk.VirtualListView(); - this.colAddress = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colDomain = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colPct = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colMapped = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colSize = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colFlag01 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colFlag02 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colFlag04 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colFlag08 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colFlag10 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colFlag20 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colFlag40 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.colFlag80 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.tsbExportText = new System.Windows.Forms.ToolStripButton(); - this.menuStrip1.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // 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(992, 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); - // - // toolStrip1 - // - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.tsbLoggingActive, - this.toolStripSeparator3, - this.tsbViewUpdate, - this.tsbViewStyle, - this.toolStripSeparator4, - this.tsbExportText}); - this.toolStrip1.Location = new System.Drawing.Point(0, 24); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(992, 25); - this.toolStrip1.TabIndex = 8; - this.toolStrip1.Text = "toolStrip1"; - // - // tsbLoggingActive - // - this.tsbLoggingActive.CheckOnClick = true; - this.tsbLoggingActive.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tsbLoggingActive.Image = ((System.Drawing.Image)(resources.GetObject("tsbLoggingActive.Image"))); - this.tsbLoggingActive.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbLoggingActive.Name = "tsbLoggingActive"; - this.tsbLoggingActive.Size = new System.Drawing.Size(41, 22); - this.tsbLoggingActive.Text = "Active"; - this.tsbLoggingActive.CheckedChanged += new System.EventHandler(this.tsbLoggingActive_CheckedChanged); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); - // - // tsbViewUpdate - // - this.tsbViewUpdate.Checked = true; - this.tsbViewUpdate.CheckOnClick = true; - this.tsbViewUpdate.CheckState = System.Windows.Forms.CheckState.Checked; - this.tsbViewUpdate.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tsbViewUpdate.Image = ((System.Drawing.Image)(resources.GetObject("tsbViewUpdate.Image"))); - this.tsbViewUpdate.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbViewUpdate.Name = "tsbViewUpdate"; - this.tsbViewUpdate.Size = new System.Drawing.Size(46, 22); - this.tsbViewUpdate.Text = "Update"; - // - // tsbViewStyle - // - this.tsbViewStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.tsbViewStyle.Items.AddRange(new object[] { - "Show %", - "Show Bytes", - "Show KBytes"}); - this.tsbViewStyle.Name = "tsbViewStyle"; - this.tsbViewStyle.Size = new System.Drawing.Size(121, 25); - this.tsbViewStyle.SelectedIndexChanged += new System.EventHandler(this.tsbViewStyle_SelectedIndexChanged); - // - // lvCDL - // - this.lvCDL.BlazingFast = false; - this.lvCDL.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.colAddress, - this.colDomain, - this.colPct, - this.colMapped, - this.colSize, - this.colFlag01, - this.colFlag02, - this.colFlag04, - this.colFlag08, - this.colFlag10, - this.colFlag20, - this.colFlag40, - this.colFlag80}); - this.lvCDL.Dock = System.Windows.Forms.DockStyle.Fill; - this.lvCDL.FullRowSelect = true; - this.lvCDL.GridLines = true; - this.lvCDL.ItemCount = 0; - this.lvCDL.Location = new System.Drawing.Point(0, 49); - this.lvCDL.Name = "lvCDL"; - this.lvCDL.SelectAllInProgress = false; - this.lvCDL.selectedItem = -1; - this.lvCDL.Size = new System.Drawing.Size(992, 323); - this.lvCDL.TabIndex = 9; - this.lvCDL.UseCompatibleStateImageBehavior = false; - this.lvCDL.UseCustomBackground = true; - this.lvCDL.View = System.Windows.Forms.View.Details; - this.lvCDL.VirtualMode = true; - this.lvCDL.QueryItemText += new BizHawk.Client.EmuHawk.QueryItemTextHandler(this.lvCDL_QueryItemText); - // - // colAddress - // - this.colAddress.Text = "CDL File @"; - this.colAddress.Width = 107; - // - // colDomain - // - this.colDomain.Text = "Domain"; - this.colDomain.Width = 126; - // - // colPct - // - this.colPct.Text = "%"; - this.colPct.Width = 58; - // - // colMapped - // - this.colMapped.Text = "Mapped"; - this.colMapped.Width = 64; - // - // colSize - // - this.colSize.Text = "Size"; - this.colSize.Width = 102; - // - // colFlag01 - // - this.colFlag01.Text = "0x01"; - // - // colFlag02 - // - this.colFlag02.Text = "0x02"; - // - // colFlag04 - // - this.colFlag04.Text = "0x04"; - // - // colFlag08 - // - this.colFlag08.Text = "0x08"; - // - // colFlag10 - // - this.colFlag10.Text = "0x10"; - // - // colFlag20 - // - this.colFlag20.Text = "0x20"; - // - // colFlag40 - // - this.colFlag40.Text = "0x40"; - // - // colFlag80 - // - this.colFlag80.Text = "0x80"; - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); - // - // tsbExportText - // - this.tsbExportText.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig; - this.tsbExportText.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbExportText.Name = "tsbExportText"; - this.tsbExportText.Size = new System.Drawing.Size(87, 22); - this.tsbExportText.Text = "To Clipboard"; - this.tsbExportText.Click += new System.EventHandler(this.tsbExportText_Click); - // - // 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(992, 372); - this.Controls.Add(this.lvCDL); - this.Controls.Add(this.toolStrip1); - 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.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CDL)); + 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.miAutoStart = new System.Windows.Forms.ToolStripMenuItem(); + this.miAutoSave = 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.toolStrip1 = new ToolStripEx(); + this.tsbLoggingActive = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.tsbViewUpdate = new System.Windows.Forms.ToolStripButton(); + this.tsbViewStyle = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.tsbExportText = new System.Windows.Forms.ToolStripButton(); + this.lvCDL = new BizHawk.Client.EmuHawk.VirtualListView(); + this.colAddress = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colDomain = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colPct = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colMapped = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colSize = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colFlag01 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colFlag02 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colFlag04 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colFlag08 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colFlag10 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colFlag20 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colFlag40 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.colFlag80 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.menuStrip1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // 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(992, 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.miAutoStart, + this.miAutoSave, + 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"; + // + // miAutoStart + // + this.miAutoStart.Name = "miAutoStart"; + this.miAutoStart.Size = new System.Drawing.Size(193, 22); + this.miAutoStart.Text = "Auto-Start"; + this.miAutoStart.Click += new System.EventHandler(this.miAutoStart_Click); + // + // miAutoSave + // + this.miAutoSave.Name = "miAutoSave"; + this.miAutoSave.Size = new System.Drawing.Size(193, 22); + this.miAutoSave.Text = "Auto-Save"; + // + // 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); + // + // toolStrip1 + // + this.toolStrip1.ClickThrough = true; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tsbLoggingActive, + this.toolStripSeparator3, + this.tsbViewUpdate, + this.tsbViewStyle, + this.toolStripSeparator4, + this.tsbExportText}); + this.toolStrip1.Location = new System.Drawing.Point(0, 24); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(992, 25); + this.toolStrip1.TabIndex = 8; + this.toolStrip1.Text = "toolStrip1"; + // + // tsbLoggingActive + // + this.tsbLoggingActive.CheckOnClick = true; + this.tsbLoggingActive.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tsbLoggingActive.Image = ((System.Drawing.Image)(resources.GetObject("tsbLoggingActive.Image"))); + this.tsbLoggingActive.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbLoggingActive.Name = "tsbLoggingActive"; + this.tsbLoggingActive.Size = new System.Drawing.Size(41, 22); + this.tsbLoggingActive.Text = "Active"; + this.tsbLoggingActive.CheckedChanged += new System.EventHandler(this.tsbLoggingActive_CheckedChanged); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); + // + // tsbViewUpdate + // + this.tsbViewUpdate.Checked = true; + this.tsbViewUpdate.CheckOnClick = true; + this.tsbViewUpdate.CheckState = System.Windows.Forms.CheckState.Checked; + this.tsbViewUpdate.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tsbViewUpdate.Image = ((System.Drawing.Image)(resources.GetObject("tsbViewUpdate.Image"))); + this.tsbViewUpdate.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbViewUpdate.Name = "tsbViewUpdate"; + this.tsbViewUpdate.Size = new System.Drawing.Size(46, 22); + this.tsbViewUpdate.Text = "Update"; + // + // tsbViewStyle + // + this.tsbViewStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.tsbViewStyle.Items.AddRange(new object[] { + "Show %", + "Show Bytes", + "Show KBytes"}); + this.tsbViewStyle.Name = "tsbViewStyle"; + this.tsbViewStyle.Size = new System.Drawing.Size(121, 25); + this.tsbViewStyle.SelectedIndexChanged += new System.EventHandler(this.tsbViewStyle_SelectedIndexChanged); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + // + // tsbExportText + // + this.tsbExportText.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig; + this.tsbExportText.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbExportText.Name = "tsbExportText"; + this.tsbExportText.Size = new System.Drawing.Size(87, 22); + this.tsbExportText.Text = "To Clipboard"; + this.tsbExportText.Click += new System.EventHandler(this.tsbExportText_Click); + // + // lvCDL + // + this.lvCDL.BlazingFast = false; + this.lvCDL.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.colAddress, + this.colDomain, + this.colPct, + this.colMapped, + this.colSize, + this.colFlag01, + this.colFlag02, + this.colFlag04, + this.colFlag08, + this.colFlag10, + this.colFlag20, + this.colFlag40, + this.colFlag80}); + this.lvCDL.Dock = System.Windows.Forms.DockStyle.Fill; + this.lvCDL.FullRowSelect = true; + this.lvCDL.GridLines = true; + this.lvCDL.ItemCount = 0; + this.lvCDL.Location = new System.Drawing.Point(0, 49); + this.lvCDL.Name = "lvCDL"; + this.lvCDL.SelectAllInProgress = false; + this.lvCDL.selectedItem = -1; + this.lvCDL.Size = new System.Drawing.Size(992, 323); + this.lvCDL.TabIndex = 9; + this.lvCDL.UseCompatibleStateImageBehavior = false; + this.lvCDL.UseCustomBackground = true; + this.lvCDL.View = System.Windows.Forms.View.Details; + this.lvCDL.VirtualMode = true; + this.lvCDL.QueryItemText += new BizHawk.Client.EmuHawk.QueryItemTextHandler(this.lvCDL_QueryItemText); + // + // colAddress + // + this.colAddress.Text = "CDL File @"; + this.colAddress.Width = 107; + // + // colDomain + // + this.colDomain.Text = "Domain"; + this.colDomain.Width = 126; + // + // colPct + // + this.colPct.Text = "%"; + this.colPct.Width = 58; + // + // colMapped + // + this.colMapped.Text = "Mapped"; + this.colMapped.Width = 64; + // + // colSize + // + this.colSize.Text = "Size"; + this.colSize.Width = 102; + // + // colFlag01 + // + this.colFlag01.Text = "0x01"; + // + // colFlag02 + // + this.colFlag02.Text = "0x02"; + // + // colFlag04 + // + this.colFlag04.Text = "0x04"; + // + // colFlag08 + // + this.colFlag08.Text = "0x08"; + // + // colFlag10 + // + this.colFlag10.Text = "0x10"; + // + // colFlag20 + // + this.colFlag20.Text = "0x20"; + // + // colFlag40 + // + this.colFlag40.Text = "0x40"; + // + // colFlag80 + // + this.colFlag80.Text = "0x80"; + // + // 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(992, 372); + this.Controls.Add(this.lvCDL); + this.Controls.Add(this.toolStrip1); + 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.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + } #endregion @@ -388,9 +406,8 @@ 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.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem; - private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton tsbLoggingActive; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripButton tsbViewUpdate; @@ -410,7 +427,10 @@ private System.Windows.Forms.ColumnHeader colFlag40; private System.Windows.Forms.ColumnHeader colFlag80; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; - private System.Windows.Forms.ToolStripButton tsbExportText; + private System.Windows.Forms.ToolStripButton tsbExportText; + private System.Windows.Forms.ToolStripMenuItem miAutoStart; + private System.Windows.Forms.ToolStripMenuItem miAutoSave; + private ToolStripEx toolStrip1; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/CDL.cs b/BizHawk.Client.EmuHawk/tools/CDL.cs index 4220936432..23c44ceb23 100644 --- a/BizHawk.Client.EmuHawk/tools/CDL.cs +++ b/BizHawk.Client.EmuHawk/tools/CDL.cs @@ -181,7 +181,31 @@ namespace BizHawk.Client.EmuHawk } public bool AskSaveChanges() - { + { + //nothing to fear: + if (_cdl == null) + return true; + + //try auto-saving if appropriate + if (Global.Config.CDLAutoSave) + { + //TODO - I dont like this system. It's hard to figure out how to use it. It should be done in multiple passes. + var result = MessageBox.Show("Save changes to CDL session?", "CDL Auto Save", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (result == DialogResult.No) + return true; + + if (string.IsNullOrWhiteSpace(_currentFilename)) + { + if (!RunSaveAs()) + return false; + } + else + { + RunSave(); + return true; + } + } + return true; } @@ -208,8 +232,8 @@ namespace BizHawk.Client.EmuHawk //ok, it's all good: _cdl = newCDL; - CodeDataLogger.SetCDL(null); - if (tsbLoggingActive.Checked) + CodeDataLogger.SetCDL(null); + if (tsbLoggingActive.Checked || Global.Config.CDLAutoStart) CodeDataLogger.SetCDL(_cdl); SetCurrentFilename(path); @@ -225,21 +249,24 @@ namespace BizHawk.Client.EmuHawk AppendMenuItem.Enabled = ClearMenuItem.Enabled = DisassembleMenuItem.Enabled = - _cdl != null; + _cdl != null; + + miAutoSave.Checked = Global.Config.CDLAutoSave; + miAutoStart.Checked = Global.Config.CDLAutoStart; } 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 (tsbLoggingActive.Checked) + if (tsbLoggingActive.Checked || Global.Config.CDLAutoStart) CodeDataLogger.SetCDL(_cdl); else CodeDataLogger.SetCDL(null); @@ -281,46 +308,51 @@ namespace BizHawk.Client.EmuHawk } LoadFile(file.FullName); + } + + void RunSave() + { + _recent.Add(_currentFilename); + using (var fs = new FileStream(_currentFilename, FileMode.Create, FileAccess.Write)) + { + _cdl.Save(fs); + } } private void SaveMenuItem_Click(object sender, EventArgs e) - { + { + if (_cdl == null) + { + MessageBox.Show(this, "Cannot save with no CDL loaded!", "Alert"); + return; + } + if (string.IsNullOrWhiteSpace(_currentFilename)) { RunSaveAs(); return; - } - - using (var fs = new FileStream(_currentFilename, FileMode.Create, FileAccess.Write)) - { - _cdl.Save(fs); - } + } + + RunSave(); } - void RunSaveAs() + /// + /// returns false if the operation was canceled + /// + bool RunSaveAs() { - if (_cdl == null) - { - MessageBox.Show(this, "Cannot save with no CDL loaded!", "Alert"); - } - else - { - var file = 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); - SetCurrentFilename(file.FullName); - } - } - } + var file = SaveFileDialog( + _currentFilename, + PathManager.MakeAbsolutePath(Global.Config.PathEntries.LogPathFragment, null), + "Code Data Logger Files", + "cdl"); + + if (file == null) + return false; + + SetCurrentFilename(file.FullName); + RunSave(); + return true; } private void SaveAsMenuItem_Click(object sender, EventArgs e) @@ -399,10 +431,24 @@ namespace BizHawk.Client.EmuHawk private void ExitMenuItem_Click(object sender, EventArgs e) { Close(); + } + + protected override void OnClosing(System.ComponentModel.CancelEventArgs e) + { + if (!AskSaveChanges()) + e.Cancel = true; + base.OnClosing(e); + } + + protected override void OnShown(EventArgs e) + { + if (Global.Config.CDLAutoStart) + NewFileLogic(); + base.OnShown(e); } protected override void OnClosed(EventArgs e) - { + { //deactivate logger if (CodeDataLogger != null) //just in case... CodeDataLogger.SetCDL(null); @@ -462,6 +508,18 @@ namespace BizHawk.Client.EmuHawk sw.WriteLine(); } Clipboard.SetText(sw.ToString()); - } + } + + private void miAutoSave_Click(object sender, EventArgs e) + { + Global.Config.CDLAutoSave ^= true; + } + + private void miAutoStart_Click(object sender, EventArgs e) + { + Global.Config.CDLAutoStart ^= true; + } + + } } diff --git a/BizHawk.Client.EmuHawk/tools/CDL.resx b/BizHawk.Client.EmuHawk/tools/CDL.resx index 974f328bff..acb5948fc4 100644 --- a/BizHawk.Client.EmuHawk/tools/CDL.resx +++ b/BizHawk.Client.EmuHawk/tools/CDL.resx @@ -1,177 +1,176 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - 126, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - - - AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAQAMAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAACMWwCMWwCMWwCMWwCMWwCMWwCMWwCMWwCMWwCMWwCMWwCMWwAAAAAAAAAAAACMWxApOoZ - jN1ApOoCMWyj0/Wj0/Wj0/Wj0/Wj0/Wj0/Wj0/Wj0/UCMWwAAAACMWxApOpApOoCMWxApOoZjN0CMWyj - 0/UuKfAuKfCj0/XLPAPLPANApOpApOoCMWwCMWwZjN0CMWwQUHwCMWxApOoCMWxApOouKfCj0/Wj0/XL - PAOj0/XLPAOj0/UCMWwCMWxApOoCMWwQUHwCMWxApOoCMWyj0/UuKfCj0/Wj0/XLPAOj0/XLPAOj0/UC - MWwCMWxApOoCMWwQUHwCMWxApOoCMWyj0/UuKfCj0/Wj0/XLPAOj0/XLPAOj0/UCMWwCMWxApOoCMWwQ - UHwCMWwZjN0CMWyj0/UuKfAuKfCj0/XLPAPLPANApOpApOoCMWwCMWxApOoCMWwQUHwCMWwZjN0CMWyj - 0/Wj0/Wj0/VApOpApOpApOpApOpApOoCMWwCMWwZjN1ApOoCMWxApOpApOoCMWyj0/Wj0/Wj0/UCMWwC - MWyj0/Wj0/Wj0/UCMWwAAAACMWxApOpApOoZjN0CMWxApOpApOqj0/UCMWyj0/Wj0/Wj0/Wj0/UCMWwA - AAAAAAAAAAACMWwCMWwCMWwCMWwCMWwCMWwCMWyj0/VApOqj0/UCMWwCMWwAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAACMWyj0/VApOqj0/UOOwMOOwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAOOwMjpQUCMWyj0/UOOwMhhwkjpQUOOwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOOwMhhwkjpQUC - MWwOOwMjpQUhhwkOOwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMLAQOOwMOOwMAAAAOOwMhhwkjpQUO - OwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOOwMjpQUOOwMAAADAAwAAgAEAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAAwAMAAP+BAAD/AAAA/wAAAP8QAAD/8QAA - - ->>>>>>> refs/remotes/TASVideos/master + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 126, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAQAMAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAACMWwCMWwCMWwCMWwCMWwCMWwCMWwCMWwCMWwCMWwCMWwCMWwAAAAAAAAAAAACMWxApOoZ + jN1ApOoCMWyj0/Wj0/Wj0/Wj0/Wj0/Wj0/Wj0/Wj0/UCMWwAAAACMWxApOpApOoCMWxApOoZjN0CMWyj + 0/UuKfAuKfCj0/XLPAPLPANApOpApOoCMWwCMWwZjN0CMWwQUHwCMWxApOoCMWxApOouKfCj0/Wj0/XL + PAOj0/XLPAOj0/UCMWwCMWxApOoCMWwQUHwCMWxApOoCMWyj0/UuKfCj0/Wj0/XLPAOj0/XLPAOj0/UC + MWwCMWxApOoCMWwQUHwCMWxApOoCMWyj0/UuKfCj0/Wj0/XLPAOj0/XLPAOj0/UCMWwCMWxApOoCMWwQ + UHwCMWwZjN0CMWyj0/UuKfAuKfCj0/XLPAPLPANApOpApOoCMWwCMWxApOoCMWwQUHwCMWwZjN0CMWyj + 0/Wj0/Wj0/VApOpApOpApOpApOpApOoCMWwCMWwZjN1ApOoCMWxApOpApOoCMWyj0/Wj0/Wj0/UCMWwC + MWyj0/Wj0/Wj0/UCMWwAAAACMWxApOpApOoZjN0CMWxApOpApOqj0/UCMWyj0/Wj0/Wj0/Wj0/UCMWwA + AAAAAAAAAAACMWwCMWwCMWwCMWwCMWwCMWwCMWyj0/VApOqj0/UCMWwCMWwAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAACMWyj0/VApOqj0/UOOwMOOwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAOOwMjpQUCMWyj0/UOOwMhhwkjpQUOOwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOOwMhhwkjpQUC + MWwOOwMjpQUhhwkOOwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMLAQOOwMOOwMAAAAOOwMhhwkjpQUO + OwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOOwMjpQUOOwMAAADAAwAAgAEAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAAwAMAAP+BAAD/AAAA/wAAAP8QAAD/8QAA + + \ No newline at end of file