From 61427ec505a42cb2b104a9b70f65e3a7ded2e20b Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Sat, 12 Feb 2022 15:08:00 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20Cleanup=20App.busy=20->=20PhpEnv?= =?UTF-8?q?.shared.isBusy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Domain/App/App.swift | 6 ------ phpmon/Domain/Menu/MainMenu.swift | 2 +- phpmon/Domain/Menu/StatusMenu.swift | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/phpmon/Domain/App/App.swift b/phpmon/Domain/App/App.swift index db971bb..857b9a9 100644 --- a/phpmon/Domain/App/App.swift +++ b/phpmon/Domain/App/App.swift @@ -36,12 +36,6 @@ class App { return machine } - /** Whether the app is busy doing something. Used to determine what UI to display. */ - // TODO: Remove this, and always use PhpEnv.shared.isBusy - static var busy: Bool { - return PhpEnv.shared.isBusy - } - // MARK: Variables /** The list of preferences that are currently active. */ diff --git a/phpmon/Domain/Menu/MainMenu.swift b/phpmon/Domain/Menu/MainMenu.swift index 6dc1300..3d2aedc 100644 --- a/phpmon/Domain/Menu/MainMenu.swift +++ b/phpmon/Domain/Menu/MainMenu.swift @@ -145,7 +145,7 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate, PhpSwitcherDelegate /** Refreshes the icon with the PHP version. */ @objc func refreshIcon() { DispatchQueue.main.async { [self] in - if (App.busy) { + if (PhpEnv.shared.isBusy) { setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!) } else { if Preferences.preferences[.shouldDisplayDynamicIcon] as! Bool == false { diff --git a/phpmon/Domain/Menu/StatusMenu.swift b/phpmon/Domain/Menu/StatusMenu.swift index 326fdef..84905a8 100644 --- a/phpmon/Domain/Menu/StatusMenu.swift +++ b/phpmon/Domain/Menu/StatusMenu.swift @@ -22,7 +22,7 @@ class StatusMenu : NSMenu { } func addPhpActionMenuItems() { - if App.busy { + if PhpEnv.shared.isBusy { addItem(NSMenuItem(title: "mi_busy".localized, action: nil, keyEquivalent: "")) return }