macOS: Use new core components

ShendoXT · Oct 11, 2024 · 37cec53 · 37cec53
1 parent 77d16ef
commit 37cec53
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -362,3 +362,5 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 /MemcardRex/.DS_Store
+.DS_Store
+MemcardRex.macOS/Resources/.DS_Store
diff --git a/MemcardRex.macOS/macOS/GUI/InfoDialogController.cs b/MemcardRex.macOS/macOS/GUI/InfoDialogController.cs
@@ -4,6 +4,7 @@
 using System.Drawing;
 using Foundation;
 using AppKit;
+using MemcardRex.Core;
 
 namespace MemcardRex
 {

diff --git a/MemcardRex.macOS/macOS/GUI/PreferencesViewController.cs b/MemcardRex.macOS/macOS/GUI/PreferencesViewController.cs
@@ -37,7 +37,7 @@ public override void ViewWillAppear()
             //Read program settings
             iconPopup.SelectItem(iconPopup.ItemAtIndex(App.appSettings.IconBackgroundColor));
             formatPopup.SelectItem(formatPopup.ItemAtIndex(App.appSettings.FormatType));
-            speedPopup.SelectItem(speedPopup.ItemAtIndex(App.appSettings.CommunicationSpeed));
+            //speedPopup.SelectItem(speedPopup.ItemAtIndex(App.appSettings.CommunicationSpeed));
             cardPopup.SelectItem(cardPopup.ItemAtIndex(App.appSettings.CardSlot));
 
             addressInput.StringValue = App.appSettings.RemoteCommAddress;
@@ -65,7 +65,7 @@ void ConfirmDialog(NSObject sender)
             //Save program settings
             App.appSettings.IconBackgroundColor = (int) iconPopup.IndexOfSelectedItem;
             App.appSettings.FormatType = (int) formatPopup.IndexOfSelectedItem;
-            App.appSettings.CommunicationSpeed = (int)speedPopup.IndexOfSelectedItem;
+            //App.appSettings.CommunicationSpeed = (int)speedPopup.IndexOfSelectedItem;
             App.appSettings.CardSlot = (int)cardPopup.IndexOfSelectedItem;
 
             if (addressInput.StringValue != "")

diff --git a/MemcardRex.macOS/macOS/GUI/ViewController.cs b/MemcardRex.macOS/macOS/GUI/ViewController.cs
@@ -376,7 +376,7 @@ public void InitHardwareCommunication(int deviceId, int deviceMode, int commMode
             //Send either serial port data or address data from TCP
             if (deviceMode == (int)HardwareInterface.Modes.serial)
             {
-                errMsg = hardInterface.Start(App.appSettings.CommunicationPort, App.appSettings.CommunicationSpeed);
+                errMsg = hardInterface.Start(App.appSettings.CommunicationPort, 0);
             }
             else
             {

diff --git a/MemcardRex.macOS/macOS/TableDataClass.cs b/MemcardRex.macOS/macOS/TableDataClass.cs
@@ -4,6 +4,7 @@
 using Foundation;
 using System.Collections.Generic;
 using System.Drawing;
+using MemcardRex.Core;
 
 namespace MemcardRex
 {