From eaf653e3c0f8f1431ff4afd44f44fc8f7e7aaadf Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Fri, 17 Dec 2021 13:11:22 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Disable=20valet=20switching=20fo?= =?UTF-8?q?r=20next=20release=20(#34)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Domain/Menu/MainMenu.swift | 5 +++-- phpmon/Domain/Preferences/PrefsVC.swift | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/phpmon/Domain/Menu/MainMenu.swift b/phpmon/Domain/Menu/MainMenu.swift index 1f215d3..0a6936c 100644 --- a/phpmon/Domain/Menu/MainMenu.swift +++ b/phpmon/Domain/Menu/MainMenu.swift @@ -376,6 +376,7 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate { } } + /* DISABLED UNTIL VALET SWITCHING IS OK (see #34) if Preferences.preferences[.useInternalSwitcher] as! Bool == false { // 1. Default switcher using Valet // Will cause less issues, but is slower @@ -384,7 +385,7 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate { availableVersions: App.shared.availablePhpVersions, completed: completion ) - } else { + } else { */ // 2. Custom switcher (internal) // Will cause more issues with Homebrew and is faster Actions.switchToPhpVersion( @@ -392,7 +393,7 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate { availableVersions: App.shared.availablePhpVersions, completed: completion ) - } + /* } */ } } diff --git a/phpmon/Domain/Preferences/PrefsVC.swift b/phpmon/Domain/Preferences/PrefsVC.swift index c816bec..ee3208d 100644 --- a/phpmon/Domain/Preferences/PrefsVC.swift +++ b/phpmon/Domain/Preferences/PrefsVC.swift @@ -74,13 +74,14 @@ class PrefsVC: NSViewController { preference: .autoServiceRestartAfterExtensionToggle, action: {} ), + /* DISABLED UNTIL VALET SWITCHING IS OK (see #34) CheckboxPreferenceView.make( sectionText: "", descriptionText: "prefs.use_internal_switcher_desc".localized, checkboxText: "prefs.use_internal_switcher".localized, preference: .useInternalSwitcher, action: {} - ), + ), */ HotkeyPreferenceView.make( sectionText: "prefs.global_shortcut".localized, descriptionText: "prefs.shortcut_desc".localized,