From 037077dd23845b2749403dec7ad4200d984fc1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hein=20Andre=20Gr=C3=B8nnestad?= Date: Fri, 4 Oct 2019 00:14:17 +0200 Subject: [PATCH] #12 Added Reset-button --- .../Commodore64/FormC64Screen.Designer.cs | 53 ++++++++++++------- ComputerSystems/Commodore64/FormC64Screen.cs | 4 ++ .../Commodore64/FormC64Screen.resx | 13 +++++ 3 files changed, 50 insertions(+), 20 deletions(-) diff --git a/ComputerSystems/Commodore64/FormC64Screen.Designer.cs b/ComputerSystems/Commodore64/FormC64Screen.Designer.cs index 065f8a2..ef6a04c 100644 --- a/ComputerSystems/Commodore64/FormC64Screen.Designer.cs +++ b/ComputerSystems/Commodore64/FormC64Screen.Designer.cs @@ -29,8 +29,10 @@ private void InitializeComponent() { this.lblFps = new System.Windows.Forms.ToolStripStatusLabel(); this.lblCycles = new System.Windows.Forms.ToolStripStatusLabel(); this.lblInstructions = new System.Windows.Forms.ToolStripStatusLabel(); + this.lblKeyboardDisabled = new System.Windows.Forms.ToolStripStatusLabel(); this.toolMain = new System.Windows.Forms.ToolStrip(); this.btnRestart = new System.Windows.Forms.ToolStripButton(); + this.btnPause = new System.Windows.Forms.ToolStripButton(); this.separator1 = new System.Windows.Forms.ToolStripSeparator(); this.btnOpen = new System.Windows.Forms.ToolStripButton(); this.btnSave = new System.Windows.Forms.ToolStripButton(); @@ -40,10 +42,9 @@ private void InitializeComponent() { this.btnCopyOutput = new System.Windows.Forms.ToolStripSplitButton(); this.btnCopyRawOutput = new System.Windows.Forms.ToolStripMenuItem(); this.btnMemoryWatch = new System.Windows.Forms.ToolStripButton(); - this.btnPause = new System.Windows.Forms.ToolStripButton(); this.ofd = new System.Windows.Forms.OpenFileDialog(); this.sfd = new System.Windows.Forms.SaveFileDialog(); - this.lblKeyboardDisabled = new System.Windows.Forms.ToolStripStatusLabel(); + this.btnReset = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.pScreen)).BeginInit(); this.statusMain.SuspendLayout(); this.toolMain.SuspendLayout(); @@ -97,10 +98,20 @@ private void InitializeComponent() { this.lblInstructions.Size = new System.Drawing.Size(82, 19); this.lblInstructions.Text = "0 instructions"; // + // lblKeyboardDisabled + // + this.lblKeyboardDisabled.ForeColor = System.Drawing.Color.Red; + this.lblKeyboardDisabled.Name = "lblKeyboardDisabled"; + this.lblKeyboardDisabled.Size = new System.Drawing.Size(455, 19); + this.lblKeyboardDisabled.Spring = true; + this.lblKeyboardDisabled.Text = "Keyboard Disabled"; + this.lblKeyboardDisabled.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // toolMain // this.toolMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.btnRestart, + this.btnReset, this.btnPause, this.separator1, this.btnOpen, @@ -126,6 +137,17 @@ private void InitializeComponent() { this.btnRestart.Text = "Restart"; this.btnRestart.Click += new System.EventHandler(this.BtnRestart_Click); // + // btnPause + // + this.btnPause.CheckOnClick = true; + this.btnPause.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnPause.Image = ((System.Drawing.Image)(resources.GetObject("btnPause.Image"))); + this.btnPause.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnPause.Name = "btnPause"; + this.btnPause.Size = new System.Drawing.Size(23, 22); + this.btnPause.Text = "Pause"; + this.btnPause.Click += new System.EventHandler(this.BtnPause_ClickAsync); + // // separator1 // this.separator1.Name = "separator1"; @@ -204,17 +226,6 @@ private void InitializeComponent() { this.btnMemoryWatch.Text = "toolStripButton1"; this.btnMemoryWatch.Click += new System.EventHandler(this.BtnMemoryWatch_Click); // - // btnPause - // - this.btnPause.CheckOnClick = true; - this.btnPause.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btnPause.Image = ((System.Drawing.Image)(resources.GetObject("btnPause.Image"))); - this.btnPause.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btnPause.Name = "btnPause"; - this.btnPause.Size = new System.Drawing.Size(23, 22); - this.btnPause.Text = "Pause"; - this.btnPause.Click += new System.EventHandler(this.BtnPause_ClickAsync); - // // ofd // this.ofd.Filter = "PRG-files|*.prg"; @@ -223,14 +234,15 @@ private void InitializeComponent() { // this.sfd.Filter = "PRG-files|*.prg"; // - // lblKeyboardDisabled + // btnReset // - this.lblKeyboardDisabled.ForeColor = System.Drawing.Color.Red; - this.lblKeyboardDisabled.Name = "lblKeyboardDisabled"; - this.lblKeyboardDisabled.Size = new System.Drawing.Size(455, 19); - this.lblKeyboardDisabled.Spring = true; - this.lblKeyboardDisabled.Text = "Keyboard Disabled"; - this.lblKeyboardDisabled.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.btnReset.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnReset.Image = ((System.Drawing.Image)(resources.GetObject("btnReset.Image"))); + this.btnReset.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnReset.Name = "btnReset"; + this.btnReset.Size = new System.Drawing.Size(23, 22); + this.btnReset.Text = "Reset"; + this.btnReset.Click += new System.EventHandler(this.BtnReset_Click); // // FormC64Screen // @@ -278,5 +290,6 @@ private void InitializeComponent() { private System.Windows.Forms.ToolStripButton btnMemoryWatch; private System.Windows.Forms.ToolStripButton btnPause; private System.Windows.Forms.ToolStripStatusLabel lblKeyboardDisabled; + private System.Windows.Forms.ToolStripButton btnReset; } } \ No newline at end of file diff --git a/ComputerSystems/Commodore64/FormC64Screen.cs b/ComputerSystems/Commodore64/FormC64Screen.cs index 2e7fa35..8a98fa4 100644 --- a/ComputerSystems/Commodore64/FormC64Screen.cs +++ b/ComputerSystems/Commodore64/FormC64Screen.cs @@ -272,5 +272,9 @@ private void FormC64Screen_Activated(object sender, EventArgs e) { private void FormC64Screen_Deactivate(object sender, EventArgs e) { C64.KeyboardActivated = false; } + + private void BtnReset_Click(object sender, EventArgs e) { + C64.Cpu.Reset(); + } } } diff --git a/ComputerSystems/Commodore64/FormC64Screen.resx b/ComputerSystems/Commodore64/FormC64Screen.resx index 9f01c3d..973ff5e 100644 --- a/ComputerSystems/Commodore64/FormC64Screen.resx +++ b/ComputerSystems/Commodore64/FormC64Screen.resx @@ -133,6 +133,19 @@ M2BoFUoBPQmfrdczuJlBWKQUwHP413olfIgkR+YSPjXy1gGwFwz2FqE7jpcaeZsBzCQMppv9SALZUwDO FZNzLoXgZ78D4CZH6J3QJntlYFTW2S8xgumdlFT8FyLMhAExZY6Kyjr5G6vqCd75W94rGs+HAAAAAElF TkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGdSURBVDhPvVLLTgJBENwP8ApLWCC8w7K7IbxhCbBXTfwF + 736BB4MxXjz4HUYT/RIf8eaNgxpNPIge1BhlM1YNg4ryuFnJJLs13dXV3aP9K6LR6Kb6nA3DMNaSyeSR + +p1Aq9UStm3f6LpuKeob8Xi8V61Wnz3PE/l8/kTRE2g0Gn6z2RSVSuX9SyQQCCyBeGXi+CQSiR15+QtI + sguFwgOEhGVZV4qWtj3Xdf2xQCgUMtXVH1AEBYe1Wk1gJtuShP0NCkD9Dn36kpyDVCp1QIFsNnuuBYNB + vdPpiG63K3gJ1XUZNQdwuEwBDPRRzqDdbksBiqmYuWAcBi5KpdLILXp6oYtwOLwqiQWgAwpgkANJwMol + XWQymWNJLAC2tI+ijD+VBB7OHgWwYz8SiTiSnAHuv1gsfpTLZYHYnqI1zXGcW740XA64KkVPgMnAPZNz + uVxf0SMwCX0NsU6BCfvpdPoQva5wYOyZtiE+pHWs+23qW2EFOLnmS+Op1+sUk4dDY2XTNPtTk38iFovt + wuIFxJ5Q0ee+8WjO0POWClHQtE/bSopZQvIesgAAAABJRU5ErkJggg==