👌 Quality of life changes

- Moved DonationUrl to Constants
- Added additional menu items (visible if window is open)
- Fixed capitalisation of "WordPress" in PhpFrameworks
- Cleanup Stats
- Add new translation strings for menu items

PHP Monitor.xcodeproj/project.pbxproj

@@ -1218,7 +1218,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 553;
+				CURRENT_PROJECT_VERSION = 560;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = phpmon/Info.plist;
@@ -1227,7 +1227,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = "5.0-rc4";
+				MARKETING_VERSION = "5.0-rc5";
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1243,7 +1243,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 553;
+				CURRENT_PROJECT_VERSION = 560;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = phpmon/Info.plist;
@@ -1252,7 +1252,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = "5.0-rc4";
+				MARKETING_VERSION = "5.0-rc5";
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

phpmon-common/Core/Constants.swift

@@ -51,4 +51,9 @@ class Constants {
         "8.2"
     ]
 
+    /**
+     The URL that people can visit if they wish to help support the project.
+     */
+    static let DonationUrl = URL(string: "https://nicoverbruggen.be/sponsor#pay-now")!
+
 }

phpmon/Domain/Core/AppDelegate+MenuOutlets.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import AppKit
 
 /**
  Any outlets connected to the app's main menu (not the menu that shows when the icon in
@@ -24,6 +25,13 @@ extension AppDelegate {
     
     // MARK: - Menu Interactions
     
+    @IBAction func addSiteLinkPressed(_ sender: Any) {
+        SiteListVC.show()
+        
+        guard let windowController = App.shared.siteListWindowController else { return }
+        windowController.pressedAddLink(nil)
+    }
+    
     @IBAction func reloadSiteListPressed(_ sender: Any) {
         let vc = App.shared.siteListWindowController?
             .window?.contentViewController as? SiteListVC
@@ -37,4 +45,11 @@ extension AppDelegate {
         }
     }
     
+    @IBAction func focusSearchField(_ sender: Any) {
+        SiteListVC.show()
+        
+        guard let windowController = App.shared.siteListWindowController else { return }
+        windowController.searchToolbarItem.searchField.becomeFirstResponder()
+    }
+    
 }

phpmon/Domain/Core/Base.lproj/Main.storyboard

@@ -50,11 +50,31 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Sites" id="YTZ-bb-TOG">
                                     <items>
-                                        <menuItem title="Reload Site List" keyEquivalent="r" id="Ema-AU-Nbr">
+                                        <menuItem title="add-as-link" keyEquivalent="n" id="du1-bO-N2U" userLabel="Add Link" customClass="LocalizedMenuItem" customModule="PHP_Monitor" customModuleProvider="target">
+                                            <userDefinedRuntimeAttributes>
+                                                <userDefinedRuntimeAttribute type="string" keyPath="localizationKey" value="mm_add_folder_as_link"/>
+                                            </userDefinedRuntimeAttributes>
+                                            <connections>
+                                                <action selector="addSiteLinkPressed:" target="Voe-Tx-rLC" id="DzS-MY-6g0"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="reload-list" keyEquivalent="r" id="Ema-AU-Nbr" customClass="LocalizedMenuItem" customModule="PHP_Monitor" customModuleProvider="target">
+                                            <userDefinedRuntimeAttributes>
+                                                <userDefinedRuntimeAttribute type="string" keyPath="localizationKey" value="mm_reload_site_list"/>
+                                            </userDefinedRuntimeAttributes>
                                             <connections>
                                                 <action selector="reloadSiteListPressed:" target="Voe-Tx-rLC" id="geC-Ld-haX"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="2ux-8Q-UjK"/>
+                                        <menuItem title="focus-find" keyEquivalent="f" id="I95-fb-EL7" customClass="LocalizedMenuItem" customModule="PHP_Monitor" customModuleProvider="target">
+                                            <userDefinedRuntimeAttributes>
+                                                <userDefinedRuntimeAttribute type="string" keyPath="localizationKey" value="mm_find_in_site_list"/>
+                                            </userDefinedRuntimeAttributes>
+                                            <connections>
+                                                <action selector="focusSearchField:" target="Voe-Tx-rLC" id="O8j-1B-hll"/>
+                                            </connections>
+                                        </menuItem>
                                     </items>
                                 </menu>
                             </menuItem>
@@ -299,7 +319,7 @@
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="PHP_Monitor" customModuleProvider="target"/>
             </objects>
-            <point key="canvasLocation" x="-484" y="32"/>
+            <point key="canvasLocation" x="-495" y="-44"/>
         </scene>
         <!--Window Controller-->
         <scene sceneID="PQa-AT-b2a">
@@ -589,6 +609,10 @@ Gw
                         <rect key="frame" x="0.0" y="0.0" width="600" height="309"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
+                            <customView id="j65-Lf-0lG">
+                                <rect key="frame" x="9" y="0.0" width="581" height="203"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
                             <scrollView autohidesScrollers="YES" horizontalLineScroll="54" horizontalPageScroll="10" verticalLineScroll="54" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p0j-eB-I2i">
                                 <rect key="frame" x="0.0" y="0.0" width="600" height="309"/>
                                 <clipView key="contentView" id="6IL-DW-37w">
@@ -776,7 +800,7 @@ Gw
                 </viewController>
                 <customObject id="HgD-aB-bQb" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="251" y="742"/>
+            <point key="canvasLocation" x="251" y="741.5"/>
         </scene>
     </scenes>
     <resources>
@@ -786,7 +810,7 @@ Gw
         <image name="arrow.clockwise" catalog="system" width="14" height="16"/>
         <image name="plus" catalog="system" width="14" height="13"/>
         <namedColor name="IconColorGreen">
-            <color red="0.2467108965" green="0.69713878631591797" blue="0.50060153009999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.24699999392032623" green="0.69700002670288086" blue="0.50099998712539673" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

phpmon/Domain/Extensions/NSMenuExtension.swift

@@ -16,3 +16,14 @@ extension NSMenu {
     }
     
 }
+
+@IBDesignable class LocalizedMenuItem: NSMenuItem {
+    
+    @IBInspectable
+    var localizationKey: String? {
+        didSet {
+            self.title = localizationKey?.localized ?? self.title
+        }
+    }
+    
+}

phpmon/Domain/Integrations/Composer/PhpFrameworks.swift

@@ -34,7 +34,7 @@ struct PhpFrameworks {
         "october/october": "OctoberCMS",
         "sculpin/sculpin": "Sculpin",
         "statamic/cms": "Statamic",
-        "johnpbloch/wordpress-core": "Wordpress",
+        "johnpbloch/wordpress-core": "WordPress",
         "zendframework/zendframework": "Zend",
         "zendframework/zend-mvc": "Zend"
         

phpmon/Domain/Menu/MainMenu.swift

@@ -361,6 +361,10 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
         SiteListVC.show()
     }
     
+    @objc func openDonate() {
+        NSWorkspace.shared.open(Constants.DonationUrl)
+    }
+    
     @objc func terminateApp() {
         NSApplication.shared.terminate(nil)
     }

phpmon/Domain/Preferences/Stats.swift

@@ -70,6 +70,21 @@ class Stats {
         )
     }
     
+    /**
+     Determine if the sponsor message should be displayed.
+     
+     The rationale behind this is simple, some of the stats
+     increasing beyond a certain point indicate the app
+     is being used.
+     
+     We evaluate, first:
+     - Successful version switches
+     OR
+     - Successful starts of the application
+     
+     AND, of course, you must never have seen the alert before.
+     (see `didSeeSponsorEncouragement`)
+     */
     public static func evaluateSponsorMessageShouldBeDisplayed() {
         if Bundle.main.bundleIdentifier?.contains("beta") ?? false {
             return Log.info("Sponsor messages never apply to beta builds.")
@@ -92,8 +107,7 @@ class Stats {
                 style: .informational)
             if donate {
                 Log.info("The user is an absolute badass for choosing this option. Thank you.")
-                guard let url = URL(string: "https://nicoverbruggen.be/sponsor#pay-now") else { return }
+                NSWorkspace.shared.open(Constants.DonationUrl)
-                NSWorkspace.shared.open(url)
             }
             UserDefaults.standard.set(true, forKey: InternalStats.didSeeSponsorEncouragement.rawValue)
         }

phpmon/Localizable.strings

@@ -52,9 +52,16 @@
 "mi_sitelist" = "View Linked and Parked Domains...";
 
 "mi_preferences" = "Preferences...";
+"mi_donate" = "Donate...";
 "mi_quit" = "Quit PHP Monitor";
 "mi_about" = "About PHP Monitor";
 
+// MENU ITEMS (if window is open)
+
+"mm_add_folder_as_link" = "Add Folder as Link...";
+"mm_reload_site_list" = "Reload Site List";
+"mm_find_in_site_list" = "Search in Site List";
+
 // SITE LIST
 
 "site_list.title" = "Domains";