diff --git a/.gitignore b/.gitignore index be78d01..cc4368e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ phpmon.xcodeproj/project.xcworkspace phpmon.xcodeproj/xcuserdata +PHP Monitor.xcodeproj/project.xcworkspace +PHP Monitor.xcodeproj/xcuserdata diff --git a/phpmon.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj similarity index 95% rename from phpmon.xcodeproj/project.pbxproj rename to PHP Monitor.xcodeproj/project.pbxproj index 51838f7..59c7c30 100644 --- a/phpmon.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -21,11 +21,10 @@ C4D8016622B1584700C6DA1B /* Startup.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D8016522B1584700C6DA1B /* Startup.swift */; }; C4EE188422D3386B00E126E5 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE188322D3386B00E126E5 /* Constants.swift */; }; C4F8C0A422D4F12C002EFE61 /* DateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F8C0A322D4F12C002EFE61 /* DateExtension.swift */; }; - C4F8C0A622D4FA41002EFE61 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = C4F8C0A522D4FA41002EFE61 /* README.md */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - C41C1B3322B0097F00E7CF16 /* phpmon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = phpmon.app; sourceTree = BUILT_PRODUCTS_DIR; }; + C41C1B3322B0097F00E7CF16 /* PHP Monitor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "PHP Monitor.app"; sourceTree = BUILT_PRODUCTS_DIR; }; C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; C41C1B3822B0097F00E7CF16 /* LogViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogViewController.swift; sourceTree = ""; }; C41C1B3A22B0098000E7CF16 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -68,7 +67,7 @@ C41C1B3422B0097F00E7CF16 /* Products */ = { isa = PBXGroup; children = ( - C41C1B3322B0097F00E7CF16 /* phpmon.app */, + C41C1B3322B0097F00E7CF16 /* PHP Monitor.app */, ); name = Products; sourceTree = ""; @@ -147,9 +146,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - C41C1B3222B0097F00E7CF16 /* phpmon */ = { + C41C1B3222B0097F00E7CF16 /* PHP Monitor */ = { isa = PBXNativeTarget; - buildConfigurationList = C41C1B4322B0098000E7CF16 /* Build configuration list for PBXNativeTarget "phpmon" */; + buildConfigurationList = C41C1B4322B0098000E7CF16 /* Build configuration list for PBXNativeTarget "PHP Monitor" */; buildPhases = ( C41C1B2F22B0097F00E7CF16 /* Sources */, C41C1B3022B0097F00E7CF16 /* Frameworks */, @@ -159,9 +158,9 @@ ); dependencies = ( ); - name = phpmon; + name = "PHP Monitor"; productName = phpmon; - productReference = C41C1B3322B0097F00E7CF16 /* phpmon.app */; + productReference = C41C1B3322B0097F00E7CF16 /* PHP Monitor.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -179,7 +178,7 @@ }; }; }; - buildConfigurationList = C41C1B2E22B0097F00E7CF16 /* Build configuration list for PBXProject "phpmon" */; + buildConfigurationList = C41C1B2E22B0097F00E7CF16 /* Build configuration list for PBXProject "PHP Monitor" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -192,7 +191,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - C41C1B3222B0097F00E7CF16 /* phpmon */, + C41C1B3222B0097F00E7CF16 /* PHP Monitor */, ); }; /* End PBXProject section */ @@ -202,7 +201,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - C4F8C0A622D4FA41002EFE61 /* README.md in Resources */, C41C1B3B22B0098000E7CF16 /* Assets.xcassets in Resources */, C41C1B3E22B0098000E7CF16 /* Main.storyboard in Resources */, ); @@ -400,7 +398,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - C41C1B2E22B0097F00E7CF16 /* Build configuration list for PBXProject "phpmon" */ = { + C41C1B2E22B0097F00E7CF16 /* Build configuration list for PBXProject "PHP Monitor" */ = { isa = XCConfigurationList; buildConfigurations = ( C41C1B4122B0098000E7CF16 /* Debug */, @@ -409,7 +407,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C41C1B4322B0098000E7CF16 /* Build configuration list for PBXNativeTarget "phpmon" */ = { + C41C1B4322B0098000E7CF16 /* Build configuration list for PBXNativeTarget "PHP Monitor" */ = { isa = XCConfigurationList; buildConfigurations = ( C41C1B4422B0098000E7CF16 /* Debug */, diff --git a/README.md b/README.md index bdb7693..f854c6e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# phpmon +# PHP Monitor -phpmon is a macOS utility that runs on your Mac and displays the active PHP version in your status bar. +PHP Monitor (or phpmon) is a macOS utility that runs on your Mac and displays the active PHP version in your status bar. phpmon screenshot For me, it comes in handy when running multiple versions of PHP with Homebrew and you wish to be able to see at a glance which version is currently linked & active with Laravel Valet, and switch between versions. -This version of phpmon was developed for: +This version of PHP Monitor was developed for: * macOS Mojave (10.14) * PHP 7.x with Homebrew 2.x (with support for PHP 5.6 and PHP 7.0 [as well](https://github.com/eXolnet/homebrew-deprecated)) diff --git a/phpmon.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/phpmon.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index da22c70..0000000 --- a/phpmon.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/phpmon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/phpmon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/phpmon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/phpmon/AppDelegate.swift b/phpmon/AppDelegate.swift index 7358364..9e67ec4 100644 --- a/phpmon/AppDelegate.swift +++ b/phpmon/AppDelegate.swift @@ -1,6 +1,6 @@ // // AppDelegate.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 11/06/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved. diff --git a/phpmon/Classes/Commands/Actions.swift b/phpmon/Classes/Commands/Actions.swift index c979b39..272bf17 100644 --- a/phpmon/Classes/Commands/Actions.swift +++ b/phpmon/Classes/Commands/Actions.swift @@ -1,6 +1,6 @@ // // Services.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 11/06/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved. diff --git a/phpmon/Classes/Commands/Startup.swift b/phpmon/Classes/Commands/Startup.swift index 7bf6bd7..aa87687 100644 --- a/phpmon/Classes/Commands/Startup.swift +++ b/phpmon/Classes/Commands/Startup.swift @@ -1,6 +1,6 @@ // // Environment.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 12/06/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved. diff --git a/phpmon/Classes/Helpers/Alert.swift b/phpmon/Classes/Helpers/Alert.swift index aa7fe05..149221f 100644 --- a/phpmon/Classes/Helpers/Alert.swift +++ b/phpmon/Classes/Helpers/Alert.swift @@ -1,6 +1,6 @@ // // Alert.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 12/06/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved. diff --git a/phpmon/Classes/Helpers/MenuBarImageGenerator.swift b/phpmon/Classes/Helpers/MenuBarImageGenerator.swift index f698813..94fa5d8 100644 --- a/phpmon/Classes/Helpers/MenuBarImageGenerator.swift +++ b/phpmon/Classes/Helpers/MenuBarImageGenerator.swift @@ -1,6 +1,6 @@ // // ImageGenerator.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 11/06/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved. diff --git a/phpmon/Classes/Helpers/PhpVersion.swift b/phpmon/Classes/Helpers/PhpVersion.swift index 8d129ca..3ecda9c 100644 --- a/phpmon/Classes/Helpers/PhpVersion.swift +++ b/phpmon/Classes/Helpers/PhpVersion.swift @@ -1,6 +1,6 @@ // // PhpVersionExtractor.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 11/06/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved. diff --git a/phpmon/Constants.swift b/phpmon/Constants.swift index d06c265..2b638c2 100644 --- a/phpmon/Constants.swift +++ b/phpmon/Constants.swift @@ -1,6 +1,6 @@ // // Constants.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 08/07/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved. diff --git a/phpmon/Extensions/DateExtension.swift b/phpmon/Extensions/DateExtension.swift index 8622f0e..86a330b 100644 --- a/phpmon/Extensions/DateExtension.swift +++ b/phpmon/Extensions/DateExtension.swift @@ -1,6 +1,6 @@ // // Date.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 09/07/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved. diff --git a/phpmon/Info.plist b/phpmon/Info.plist index dbf9d4e..8e9b05a 100644 --- a/phpmon/Info.plist +++ b/phpmon/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.3 + 1.4 CFBundleVersion - 10 + 11 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/phpmon/Singletons/App.swift b/phpmon/Singletons/App.swift index 66358b2..97e4806 100644 --- a/phpmon/Singletons/App.swift +++ b/phpmon/Singletons/App.swift @@ -1,6 +1,6 @@ // // StateManager.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 11/07/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved. diff --git a/phpmon/Singletons/MainMenu.swift b/phpmon/Singletons/MainMenu.swift index 9af54f1..c5f933b 100644 --- a/phpmon/Singletons/MainMenu.swift +++ b/phpmon/Singletons/MainMenu.swift @@ -1,6 +1,6 @@ // // MainMenu.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 11/07/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved. @@ -67,11 +67,11 @@ class MainMenu: NSObject, NSWindowDelegate { } menu.addItem(NSMenuItem(title: "View shell output", action: #selector(self.openOutput), keyEquivalent: "")) menu.addItem(NSMenuItem.separator()) - menu.addItem(NSMenuItem(title: "About phpmon", action: #selector(self.openAbout), keyEquivalent: "")) + menu.addItem(NSMenuItem(title: "About PHP Monitor", action: #selector(self.openAbout), keyEquivalent: "")) menu.items.forEach({ (item) in item.target = self }) - menu.addItem(NSMenuItem(title: "Quit phpmon", action: #selector(NSApplication.terminate(_:)), keyEquivalent: "q")) + menu.addItem(NSMenuItem(title: "Quit PHP Monitor", action: #selector(NSApplication.terminate(_:)), keyEquivalent: "q")) DispatchQueue.main.async { self.statusItem.menu = menu } diff --git a/phpmon/Singletons/Shell.swift b/phpmon/Singletons/Shell.swift index 1ff855d..204be91 100644 --- a/phpmon/Singletons/Shell.swift +++ b/phpmon/Singletons/Shell.swift @@ -1,6 +1,6 @@ // // Shell.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 11/06/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved. diff --git a/phpmon/View Controllers/Base.lproj/Main.storyboard b/phpmon/View Controllers/Base.lproj/Main.storyboard index 39a390e..697a5c2 100644 --- a/phpmon/View Controllers/Base.lproj/Main.storyboard +++ b/phpmon/View Controllers/Base.lproj/Main.storyboard @@ -11,18 +11,18 @@ - + - + - + - + @@ -34,7 +34,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/phpmon/View Controllers/LogViewController.swift b/phpmon/View Controllers/LogViewController.swift index 3df462c..961a851 100644 --- a/phpmon/View Controllers/LogViewController.swift +++ b/phpmon/View Controllers/LogViewController.swift @@ -1,6 +1,6 @@ // // ViewController.swift -// phpmon +// PHP Monitor // // Created by Nico Verbruggen on 11/06/2019. // Copyright © 2019 Nico Verbruggen. All rights reserved.