From a1df2deec5516b02228e170fb1f92f2cbf29405f Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Mon, 25 Jul 2022 20:48:26 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20Cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 12 ++++++ phpmon/Domain/Preferences/Keys.swift | 14 +++++++ .../Domain/Preferences/PrefsWC+Hotkey.swift | 38 +++++++++++++++++++ phpmon/Domain/Preferences/PrefsWC.swift | 34 ++--------------- 4 files changed, 67 insertions(+), 31 deletions(-) create mode 100644 phpmon/Domain/Preferences/Keys.swift create mode 100644 phpmon/Domain/Preferences/PrefsWC+Hotkey.swift diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 332d8f2..c15f01f 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -204,6 +204,8 @@ C4C8E81C276F54E5003AC782 /* PhpConfigWatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C8E81A276F54E5003AC782 /* PhpConfigWatcher.swift */; }; C4CCBA6C275C567B008C7055 /* PMWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CCBA6B275C567B008C7055 /* PMWindowController.swift */; }; C4CCBA6D275C567B008C7055 /* PMWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CCBA6B275C567B008C7055 /* PMWindowController.swift */; }; + C4CDA893288F1A71007CE25F /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CDA892288F1A71007CE25F /* Keys.swift */; }; + C4CDA894288F1A71007CE25F /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CDA892288F1A71007CE25F /* Keys.swift */; }; C4CE3BB827B31F2E0086CA49 /* MainMenu+Switcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CE3BB727B31F2E0086CA49 /* MainMenu+Switcher.swift */; }; C4CE3BBA27B31F670086CA49 /* ComposerWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CE3BB927B31F670086CA49 /* ComposerWindow.swift */; }; C4CE3BBB27B324230086CA49 /* MainMenu+Switcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CE3BB727B31F2E0086CA49 /* MainMenu+Switcher.swift */; }; @@ -263,6 +265,8 @@ C4F780CD25D80B75000DBC97 /* Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = C476FF9722B0DD830098105B /* Alert.swift */; }; C4F780CE25D80B75000DBC97 /* LocalNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = C474B00524C0E98C00066A22 /* LocalNotification.swift */; }; C4F8C0A422D4F12C002EFE61 /* DateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F8C0A322D4F12C002EFE61 /* DateExtension.swift */; }; + C4FACE80288F1C0D00FC478F /* PrefsWC+Hotkey.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FACE7F288F1C0D00FC478F /* PrefsWC+Hotkey.swift */; }; + C4FACE81288F1C0D00FC478F /* PrefsWC+Hotkey.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FACE7F288F1C0D00FC478F /* PrefsWC+Hotkey.swift */; }; C4FBFC532616485F00CDB8E1 /* PhpVersionDetectionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FBFC512616485F00CDB8E1 /* PhpVersionDetectionTest.swift */; }; C4FC21B128391F8E00D368BB /* MainMenu+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F361602836BFD9003598CC /* MainMenu+Actions.swift */; }; C4FE011128084FC200D1DE6D /* SelectionVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FE011028084FC200D1DE6D /* SelectionVC.swift */; }; @@ -406,6 +410,7 @@ C4C8E817276F54D8003AC782 /* App+ConfigWatch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "App+ConfigWatch.swift"; sourceTree = ""; }; C4C8E81A276F54E5003AC782 /* PhpConfigWatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhpConfigWatcher.swift; sourceTree = ""; }; C4CCBA6B275C567B008C7055 /* PMWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PMWindowController.swift; sourceTree = ""; }; + C4CDA892288F1A71007CE25F /* Keys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keys.swift; sourceTree = ""; }; C4CE3BB727B31F2E0086CA49 /* MainMenu+Switcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMenu+Switcher.swift"; sourceTree = ""; }; C4CE3BB927B31F670086CA49 /* ComposerWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposerWindow.swift; sourceTree = ""; }; C4D5CFC927E0F9CD00035329 /* NginxConfigurationFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NginxConfigurationFile.swift; sourceTree = ""; }; @@ -438,6 +443,7 @@ C4F780AD25D80B37000DBC97 /* PhpExtensionTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpExtensionTest.swift; sourceTree = ""; }; C4F8C0A322D4F12C002EFE61 /* DateExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateExtension.swift; sourceTree = ""; }; C4F8C0A522D4FA41002EFE61 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + C4FACE7F288F1C0D00FC478F /* PrefsWC+Hotkey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PrefsWC+Hotkey.swift"; sourceTree = ""; }; C4FBFC512616485F00CDB8E1 /* PhpVersionDetectionTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhpVersionDetectionTest.swift; sourceTree = ""; }; C4FE011028084FC200D1DE6D /* SelectionVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectionVC.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -464,6 +470,7 @@ isa = PBXGroup; children = ( C4998F092617633900B2526E /* PrefsWC.swift */, + C4FACE7F288F1C0D00FC478F /* PrefsWC+Hotkey.swift */, 5420395826135DC100FB00FA /* PrefsVC.swift */, 5420395E2613607600FB00FA /* Preferences.swift */, C4C3ED4227834C5200AB15D8 /* CustomPrefs.swift */, @@ -471,6 +478,7 @@ C4DEB7D327A5D60B00834718 /* Stats.swift */, C41CD0272628D8E20065BBED /* Keybinds */, 54FCFD28276C88C0004CE748 /* Views */, + C4CDA892288F1A71007CE25F /* Keys.swift */, ); path = Preferences; sourceTree = ""; @@ -1238,9 +1246,11 @@ C41CD0292628D8EE0065BBED /* GlobalKeybindPreference.swift in Sources */, C4B6091A2853AAD300C95265 /* SectionHeaderView.swift in Sources */, C44067F727E258410045BD4E /* DomainListPhpCell.swift in Sources */, + C4FACE80288F1C0D00FC478F /* PrefsWC+Hotkey.swift in Sources */, C42800AA28452AA10099C999 /* StatusMenu+Items.swift in Sources */, C415D3B72770F294005EF286 /* Actions.swift in Sources */, C4AC51FC27E27F47008528CA /* DomainListKindCell.swift in Sources */, + C4CDA893288F1A71007CE25F /* Keys.swift in Sources */, C4F361612836BFD9003598CC /* MainMenu+Actions.swift in Sources */, C44C198D276E3A1C0072762D /* ProgressWindow.swift in Sources */, 54D9E0B827E4F51E003B9AD9 /* KeyCombo.swift in Sources */, @@ -1324,6 +1334,7 @@ C449B4F427EE7FC800C47E8A /* DomainListKindCell.swift in Sources */, 54EAC806262F212B0092D14E /* GlobalKeybindPreference.swift in Sources */, C41CA5EE2774F8EE00A2C80E /* DomainListVC+Actions.swift in Sources */, + C4FACE81288F1C0D00FC478F /* PrefsWC+Hotkey.swift in Sources */, 54D9E0B727E4F51E003B9AD9 /* HotKey.swift in Sources */, C4205A7F27F4D21800191A39 /* ValetProxy.swift in Sources */, C42F26742805B4B400938AC7 /* DomainListable.swift in Sources */, @@ -1398,6 +1409,7 @@ C46E20702829D27F00D909D6 /* AppUpdaterCheckTest.swift in Sources */, C4F7809C25D80344000DBC97 /* CommandTest.swift in Sources */, C44CCD4127AFE2FC00CE40E5 /* AlertableError.swift in Sources */, + C4CDA894288F1A71007CE25F /* Keys.swift in Sources */, C4D936CA27E3EB6100BD69FE /* PhpHelper.swift in Sources */, C449B4F127EE7FC200C47E8A /* DomainListNameCell.swift in Sources */, C4F780BA25D80B62000DBC97 /* AppDelegate.swift in Sources */, diff --git a/phpmon/Domain/Preferences/Keys.swift b/phpmon/Domain/Preferences/Keys.swift new file mode 100644 index 0000000..0216aa3 --- /dev/null +++ b/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 +} diff --git a/phpmon/Domain/Preferences/PrefsWC+Hotkey.swift b/phpmon/Domain/Preferences/PrefsWC+Hotkey.swift new file mode 100644 index 0000000..0653d05 --- /dev/null +++ b/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) + } + } + +} diff --git a/phpmon/Domain/Preferences/PrefsWC.swift b/phpmon/Domain/Preferences/PrefsWC.swift index dfd080b..f9f1b64 100644 --- a/phpmon/Domain/Preferences/PrefsWC.swift +++ b/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) - } - } - } - } - }