Work on new settings dialog

Author: dirkwhoffmann

GUI/Input/GamePad.swift

@@ -364,7 +364,7 @@ class GamePad {
         if let hid = hidEvent {
 
             // Notify the GUI
-            if notify { myAppDelegate.hidEvent(event: hid.0, nr: hid.1, value: hid.2) }
+            // if notify { myAppDelegate.hidEvent(event: hid.0, nr: hid.1, value: hid.2) }
             if let controller = myAppDelegate.settingsController, controller.isVisible {
                 controller.devicesVC?.refreshDeviceEvent(event: hid.0, nr: hid.1, value: hid.2)
             }
@@ -400,7 +400,7 @@ class GamePad {
             controller.devicesVC?.refreshDeviceActions(actions: events)
         }
 
-        if notify { myAppDelegate.devicePulled(events: events) }
+        // if notify { myAppDelegate.devicePulled(events: events) }
 
         return events != []
     }

GUI/MyApplication.swift

@@ -103,7 +103,7 @@ public class MyAppDelegate: NSObject, NSApplicationDelegate {
 
     // Preferences
     var pref: Preferences!
-    var prefController: PreferencesController? // DEPRECATED
+    // var prefController: PreferencesController? // DEPRECATED
     var settingsController: SettingsWindowController?
 
     // Information provider for connected HID devices
@@ -170,7 +170,6 @@ extension MyAppDelegate {
         }
     }
 
-
     /*
     func windowDidBecomeMain(_ window: NSWindow) {
 
@@ -193,16 +192,17 @@ extension MyAppDelegate {
 
     // Callen when a HID device has been added
     func deviceAdded() {
-        prefController?.refresh()
+        // prefController?.refresh()
         settingsController?.refresh()
     }
 
     // Callen when a HID device has been removed
     func deviceRemoved() {
-        prefController?.refresh()
+        // prefController?.refresh()
         settingsController?.refresh()
     }
 
+    /*
     // Callen when a HID event comes in
     func hidEvent(event: HIDEvent, nr: Int, value: Int) {
         prefController?.refreshDeviceEvent(event: event, nr: nr, value: value)
@@ -212,6 +212,7 @@ extension MyAppDelegate {
     func devicePulled(events: [GamePadAction]) {
         prefController?.refreshDeviceActions(actions: events)
     }
+    */
 }
 
 @MainActor var myApp: MyApplication { return NSApp as! MyApplication }

GUI/MyControllerMenu.swift

@@ -123,7 +123,8 @@ extension MyController: NSMenuItemValidation {
     //
     // Action methods (App menu)
     //
-    
+
+    /*
     @IBAction func preferencesAction(_ sender: Any!) {
 
         if myAppDelegate.prefController == nil {
@@ -133,6 +134,7 @@ extension MyController: NSMenuItemValidation {
         myAppDelegate.prefController!.showWindow(self)
         myAppDelegate.prefController!.refresh()
     }
+    */
 
     @IBAction func settingsAction(_ sender: Any?) {
 
@@ -143,14 +145,14 @@ extension MyController: NSMenuItemValidation {
 
             myAppDelegate.settingsController =
             sb.instantiateController(withIdentifier: id) as? SettingsWindowController
+        }
 
-            if let sc = myAppDelegate.settingsController {
+        if let sc = myAppDelegate.settingsController {
 
-                sc.window?.level = .floating
-                sc.showWindow(self)
-                sc.window?.makeKeyAndOrderFront(nil)
-                NSApp.activate(ignoringOtherApps: true)
-            }
+            sc.window?.level = .floating
+            sc.showWindow(self)
+            sc.window?.makeKeyAndOrderFront(nil)
+            NSApp.activate(ignoringOtherApps: true)
         }
     }
 
@@ -479,7 +481,7 @@ extension MyController: NSMenuItemValidation {
         }
 
         refreshStatusBar()
-        myAppDelegate.prefController?.refresh()
+        // myAppDelegate.prefController?.refresh()
     }
 
     //

GUI/MyToolbar.swift

@@ -148,7 +148,7 @@ class MyToolbar: NSToolbar {
 
         switch sender.selectedSegment {
 
-        case 0: controller.preferencesAction(sender)
+        case 0: controller.settingsAction(sender)
         case 1: controller.openConfiguratorAsSheet()
 
         default:

vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -319,8 +319,8 @@
             filePath = "GUI/MyControllerMenu.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "600"
-            endingLineNumber = "600"
+            startingLineNumber = "602"
+            endingLineNumber = "602"
             landmarkName = "insertRecentDiskAction(_:)"
             landmarkType = "7">
          </BreakpointContent>