👌 Cleanup

phpmon/Domain/Preferences/Keys.swift

@@ -0,0 +1,14 @@
+//
+//  Keys.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 25/07/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Foundation
+
+struct Keys {
+    static let Escape = 53
+    static let Space = 49
+}

phpmon/Domain/Preferences/PrefsWC+Hotkey.swift

@@ -0,0 +1,38 @@
+//
+//  PrefsWC+Hotkey.swift
+//  PHP Monitor
+//
+//  Created by Nico Verbruggen on 25/07/2022.
+//  Copyright © 2022 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+extension PrefsWC {
+
+    // MARK: - Key Interaction
+
+    override func keyDown(with event: NSEvent) {
+        super.keyDown(with: event)
+
+        guard let tabVC = self.contentViewController as? NSTabViewController else {
+            return
+        }
+
+        guard let vc = tabVC.tabViewItems[tabVC.selectedTabViewItemIndex].viewController as? GenericPreferenceVC else {
+            return
+        }
+
+        if vc.listeningForHotkeyView == nil {
+            return
+        }
+
+        if event.keyCode == Keys.Escape || event.keyCode == Keys.Space {
+            Log.info("A blacklisted key was pressed, canceling listen!")
+            vc.listeningForHotkeyView!.unregister(nil)
+        } else {
+            vc.listeningForHotkeyView!.updateShortcut(event)
+        }
+    }
+
+}

phpmon/Domain/Preferences/PrefsWC.swift

@@ -8,11 +8,6 @@
 
 import Cocoa
 
-struct Keys {
-    static let Escape = 53
-    static let Space = 49
-}
-
 class PrefsWC: PMWindowController {
 
     // MARK: - Window Identifier
@@ -54,7 +49,7 @@ class PrefsWC: PMWindowController {
             for vc in preferencesWC.tabVCs {
                 tabVC.addChild(vc.viewController)
                 let item = tabVC.tabViewItem(for: vc.viewController)
-                item?.image = NSImage(systemSymbolName: vc.icon, accessibilityDescription: "")
+                item?.image = NSImage(systemSymbolName: vc.icon, accessibilityDescription: "\(vc.label) Icon")
                 item?.label = vc.label
             }
 
@@ -75,6 +70,8 @@ class PrefsWC: PMWindowController {
         NSApp.activate(ignoringOtherApps: true)
     }
 
+    // MARK: - Tabs
+
     struct PrefTabView {
         let viewController: GenericPreferenceVC
         let label: String
@@ -101,29 +98,4 @@ class PrefsWC: PMWindowController {
         ]
     }()
 
-    // MARK: - Key Interaction
-
-    override func keyDown(with event: NSEvent) {
-        super.keyDown(with: event)
-
-        guard let tabVC = self.contentViewController as? NSTabViewController else {
-            return
-        }
-
-        guard let selected = tabVC.tabViewItems[tabVC.selectedTabViewItemIndex].viewController else {
-            return
-        }
-
-        if let vc = selected as? GenericPreferenceVC {
-            if vc.listeningForHotkeyView != nil {
-                if event.keyCode == Keys.Escape || event.keyCode == Keys.Space {
-                    Log.info("A blacklisted key was pressed, canceling listen!")
-                    vc.listeningForHotkeyView!.unregister(nil)
-                } else {
-                    vc.listeningForHotkeyView!.updateShortcut(event)
-                }
-            }
-        }
-    }
-
 }