Reset branch

morphx666 · Jan 26, 2024 · 6c1f4bb · 6c1f4bb
1 parent 940daa8
commit 6c1f4bb
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 89 deletions.
diff --git a/GenOpCodes/My Project/AssemblyInfo.vb b/GenOpCodes/My Project/AssemblyInfo.vb
@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2024.1.26.1251")>
-<Assembly: AssemblyFileVersion("2024.1.26.1251")>
+<Assembly: AssemblyVersion("2024.1.22.1247")>
+<Assembly: AssemblyFileVersion("2024.1.22.1247")>
 
-<assembly: AssemblyInformationalVersion("2024.1.26")>
+<assembly: AssemblyInformationalVersion("2024.1.22")>
diff --git a/RunTests/My Project/AssemblyInfo.vb b/RunTests/My Project/AssemblyInfo.vb
@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2024.1.26.1630")>
-<Assembly: AssemblyFileVersion("2024.1.26.1630")>
+<Assembly: AssemblyVersion("2024.1.22.1626")>
+<Assembly: AssemblyFileVersion("2024.1.22.1626")>
 
-<assembly: AssemblyInformationalVersion("2024.1.26")>
+<assembly: AssemblyInformationalVersion("2024.1.22")>
diff --git a/x8086NetEmuConsole/My Project/AssemblyInfo.vb b/x8086NetEmuConsole/My Project/AssemblyInfo.vb
@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2024.1.26.1768")>
-<Assembly: AssemblyFileVersion("2024.1.26.1763")>
+<Assembly: AssemblyVersion("2024.1.22.1764")>
+<Assembly: AssemblyFileVersion("2024.1.22.1759")>
 
-<assembly: AssemblyInformationalVersion("2024.1.26")>
+<assembly: AssemblyInformationalVersion("2024.1.22")>
diff --git a/x8086NetEmuWinForms/FormEmulator.Designer.vb b/x8086NetEmuWinForms/FormEmulator.Designer.vb
diff --git a/x8086NetEmuWinForms/FormEmulator.vb b/x8086NetEmuWinForms/FormEmulator.vb
@@ -52,7 +52,6 @@ Public Class FormEmulator
         Me.BackColor = Color.Black
 
         'RunChecks()
-        SetupCPUClockLabels()
 
         ' New settings that are recommend to be turned on
         INT13EmulationToolStripMenuItem.Checked = True
@@ -682,8 +681,7 @@ Public Class FormEmulator
 
     Private Sub SetSimulationMultiplierFromMenu(sender As Object, e As EventArgs) Handles ToolStripMenuItemSpeed25.Click, ToolStripMenuItemSpeed50.Click,
                                                                                         ToolStripMenuItemSpeed100.Click, ToolStripMenuItemSpeed150.Click,
-                                                                                        ToolStripMenuItemSpeed200.Click, ToolStripMenuItemSpeed500.Click,
-                                                                                        ToolStripMenuItemSpeed1000.Click
+                                                                                        ToolStripMenuItemSpeed200.Click
         Dim speedText As String = CType(sender, ToolStripMenuItem).Text
         Dim speedPercentage As Integer = Integer.Parse(speedText.Replace("%", ""))
 
@@ -705,18 +703,9 @@ Public Class FormEmulator
                                                                     MHz1908ToolStripMenuItem.Click, MHz3816ToolStripMenuItem.Click,
                                                                     MHz4770ToolStripMenuItem4.Click
 
-        Dim speedValue As Double = CType(sender, ToolStripMenuItem).Tag
-        SetCPUClockSpeed(speedValue)
-    End Sub
-
-    Private Sub SetupCPUClockLabels()
-        Dim mult() As Integer = {1, 2, 4, 8, 10}
-        For i As Integer = 0 To 4
-            With CPUClockToolStripMenuItem.DropDownItems(i)
-                .Text = $"{mult(i) * X8086.BASECLOCK / X8086.MHz:N2} MHz"
-                .Tag = mult(i) * X8086.BASECLOCK
-            End With
-        Next
+        Dim speedText As String = CType(sender, ToolStripMenuItem).Text
+        Dim speedValue As Double = Double.Parse(speedText.Replace(" MHz", ""))
+        SetCPUClockSpeed(speedValue * X8086.MHz)
     End Sub
 
     Private Sub ExitToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExitToolStripMenuItem.Click
@@ -813,7 +802,7 @@ Public Class FormEmulator
                 If mi.Text.StartsWith("Custom") Then
 
                 Else
-                    mi.Checked = (ddi.Tag = value)
+                    mi.Checked = (ddi.Text = clockSpeedText)
                 End If
             End If
         Next

diff --git a/x8086NetEmuWinForms/My Project/AssemblyInfo.vb b/x8086NetEmuWinForms/My Project/AssemblyInfo.vb
@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2024.1.26.8639")>
-<Assembly: AssemblyFileVersion("2024.1.26.8637")>
+<Assembly: AssemblyVersion("2024.1.22.8635")>
+<Assembly: AssemblyFileVersion("2024.1.22.8633")>
 
-<assembly: AssemblyInformationalVersion("2024.1.26")>
+<assembly: AssemblyInformationalVersion("2024.1.22")>
diff --git a/x8086NetEmuWinForms/x8086NetEmuWinForms.vbproj b/x8086NetEmuWinForms/x8086NetEmuWinForms.vbproj
@@ -341,7 +341,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.None.Increment.None" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" />
+      <UserProperties BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.None" BuildVersion_DetectChanges="False" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.