From d2263ffaeddf37e71e1319946832c96e81500a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hein=20Andre=20Gr=C3=B8nnestad?= Date: Fri, 3 Apr 2020 01:02:52 +0200 Subject: [PATCH] #12 Added toolbar icons for VIC-II debug tools --- .../Commodore64/FormC64Screen.Designer.cs | 40 +++++++++++++++---- .../Commodore64/FormC64Screen.resx | 40 +++++-------------- 2 files changed, 43 insertions(+), 37 deletions(-) diff --git a/ComputerSystems/Commodore64/FormC64Screen.Designer.cs b/ComputerSystems/Commodore64/FormC64Screen.Designer.cs index 52d7da4..067ee60 100644 --- a/ComputerSystems/Commodore64/FormC64Screen.Designer.cs +++ b/ComputerSystems/Commodore64/FormC64Screen.Designer.cs @@ -62,6 +62,9 @@ private void InitializeComponent() { this.btnUseCrtFilter = new System.Windows.Forms.ToolStripButton(); this.btnShowVideoFrameOutlines = new System.Windows.Forms.ToolStripButton(); this.btnShowScanLinePosition = new System.Windows.Forms.ToolStripButton(); + this.lblVicIiDebugging = new System.Windows.Forms.ToolStripLabel(); + this.separator6 = new System.Windows.Forms.ToolStripSeparator(); + this.lblDebug = new System.Windows.Forms.ToolStripLabel(); ((System.ComponentModel.ISupportInitialize)(this.pScreen)).BeginInit(); this.statusMain.SuspendLayout(); this.toolMain.SuspendLayout(); @@ -158,13 +161,16 @@ private void InitializeComponent() { this.separator3, this.btnCopyOutput, this.separator4, + this.lblDebug, this.btnDebugger, this.btnClockSpeedSlower, this.btnClockSpeedFaster, this.separator5, + this.lblVicIiDebugging, this.btnShowVideoFrameOutlines, this.btnShowScanLinePosition, - this.btnShowFullFrameVideo}); + this.btnShowFullFrameVideo, + this.separator6}); this.toolMain.Location = new System.Drawing.Point(0, 0); this.toolMain.Name = "toolMain"; this.toolMain.Size = new System.Drawing.Size(1008, 25); @@ -379,11 +385,11 @@ private void InitializeComponent() { this.btnShowFullFrameVideo.Checked = true; this.btnShowFullFrameVideo.CheckOnClick = true; this.btnShowFullFrameVideo.CheckState = System.Windows.Forms.CheckState.Checked; - this.btnShowFullFrameVideo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.btnShowFullFrameVideo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.btnShowFullFrameVideo.Image = ((System.Drawing.Image)(resources.GetObject("btnShowFullFrameVideo.Image"))); this.btnShowFullFrameVideo.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnShowFullFrameVideo.Name = "btnShowFullFrameVideo"; - this.btnShowFullFrameVideo.Size = new System.Drawing.Size(98, 22); + this.btnShowFullFrameVideo.Size = new System.Drawing.Size(23, 22); this.btnShowFullFrameVideo.Text = "Show Full Frame"; // // btnUseCrtFilter @@ -403,11 +409,11 @@ private void InitializeComponent() { this.btnShowVideoFrameOutlines.Checked = true; this.btnShowVideoFrameOutlines.CheckOnClick = true; this.btnShowVideoFrameOutlines.CheckState = System.Windows.Forms.CheckState.Checked; - this.btnShowVideoFrameOutlines.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.btnShowVideoFrameOutlines.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.btnShowVideoFrameOutlines.Image = ((System.Drawing.Image)(resources.GetObject("btnShowVideoFrameOutlines.Image"))); this.btnShowVideoFrameOutlines.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnShowVideoFrameOutlines.Name = "btnShowVideoFrameOutlines"; - this.btnShowVideoFrameOutlines.Size = new System.Drawing.Size(55, 22); + this.btnShowVideoFrameOutlines.Size = new System.Drawing.Size(23, 22); this.btnShowVideoFrameOutlines.Text = "Outlines"; // // btnShowScanLinePosition @@ -415,13 +421,30 @@ private void InitializeComponent() { this.btnShowScanLinePosition.Checked = true; this.btnShowScanLinePosition.CheckOnClick = true; this.btnShowScanLinePosition.CheckState = System.Windows.Forms.CheckState.Checked; - this.btnShowScanLinePosition.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.btnShowScanLinePosition.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.btnShowScanLinePosition.Image = ((System.Drawing.Image)(resources.GetObject("btnShowScanLinePosition.Image"))); this.btnShowScanLinePosition.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnShowScanLinePosition.Name = "btnShowScanLinePosition"; - this.btnShowScanLinePosition.Size = new System.Drawing.Size(101, 22); + this.btnShowScanLinePosition.Size = new System.Drawing.Size(23, 22); this.btnShowScanLinePosition.Text = "Scanline Position"; // + // lblVicIiDebugging + // + this.lblVicIiDebugging.Name = "lblVicIiDebugging"; + this.lblVicIiDebugging.Size = new System.Drawing.Size(39, 22); + this.lblVicIiDebugging.Text = "VIC-II:"; + // + // separator6 + // + this.separator6.Name = "separator6"; + this.separator6.Size = new System.Drawing.Size(6, 25); + // + // lblDebug + // + this.lblDebug.Name = "lblDebug"; + this.lblDebug.Size = new System.Drawing.Size(33, 22); + this.lblDebug.Text = "CPU:"; + // // FormC64Screen // this.AllowDrop = true; @@ -490,5 +513,8 @@ private void InitializeComponent() { private System.Windows.Forms.ToolStripButton btnShowVideoFrameOutlines; private System.Windows.Forms.ToolStripButton btnShowScanLinePosition; private System.Windows.Forms.ToolStripButton btnShowFullFrameVideo; + private System.Windows.Forms.ToolStripLabel lblDebug; + private System.Windows.Forms.ToolStripLabel lblVicIiDebugging; + private System.Windows.Forms.ToolStripSeparator separator6; } } \ No newline at end of file diff --git a/ComputerSystems/Commodore64/FormC64Screen.resx b/ComputerSystems/Commodore64/FormC64Screen.resx index e00ce38..53425fb 100644 --- a/ComputerSystems/Commodore64/FormC64Screen.resx +++ b/ComputerSystems/Commodore64/FormC64Screen.resx @@ -227,46 +227,26 @@ 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== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACNSURBVDhPY6AaqKys/O/t7f3fwMAALwapAamFaoMAkIC9 + o8//kLz/RGEbW8evKIaATMWmEB8G6YFqZ2AAOQ0mcezYMaJokB6odoQBMEliMFYDiMFDxAWEaBCGG6Cv + ry9AigtgGKQHpBdsCIhjZm6NVSE2bGVlhekFcjBUO3EGHDhwAIMN1U4FF5APGBgA9MfKbJ0EnNgAAAAA + SUVORK5CYII= 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== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACFSURBVDhPY6AaqKys/O/t7f3fwMAALwapAamFaoMAkIC9 + o8//kLz/RGEbW8evKIaATMWmEB8G6YFqZ2AAOQ2bInwYpAeqfdQAEEA24NixY2CMrBgbhhugr68vQK4L + QHrBhoA4ZubWWBViw1ZWVpheIAdDtRNnwIEDBzDYUO1UcAH5gIEBALXEw6AaNElRAAAAAElFTkSuQmCC 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== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACASURBVDhPY6AaqKys/O/t7f3fwMAALwapAamFaoMAkIC9 + ow9JGMUQkKkgwWPHjhGFQWpBeqDaGRhAToMZEJL3Hy+GGQDSA9U+agAIUGSAvr6+ALIBxGCYASC9YENA + HDNza7AEMdjKygrTC+RgqHbiDDhw4AAGG6qdCi4gHzAwAAD2XbJGSj5phAAAAABJRU5ErkJggg==