From 82a2833161cefd1b31cd7b25cebceaba304b86cc Mon Sep 17 00:00:00 2001
From: Nico Verbruggen <mail@nicoverbruggen.be>
Date: Mon, 7 Feb 2022 17:19:57 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20Improve=20separators=20(#128)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 phpmon/Domain/Menu/HeaderView.xib   |  8 ++++----
 phpmon/Domain/Menu/StatusMenu.swift | 19 +++++++++++--------
 phpmon/Localizable.strings          |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/phpmon/Domain/Menu/HeaderView.xib b/phpmon/Domain/Menu/HeaderView.xib
index c765e7d..1bed783 100644
--- a/phpmon/Domain/Menu/HeaderView.xib
+++ b/phpmon/Domain/Menu/HeaderView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -10,7 +10,7 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe" customClass="HeaderView" customModule="PHP_Monitor" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="350" height="24"/>
+            <rect key="frame" x="0.0" y="0.0" width="270" height="24"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ddg-VQ-cOT">
@@ -29,7 +29,7 @@
             <connections>
                 <outlet property="textField" destination="ddg-VQ-cOT" id="aaQ-Xb-o2X"/>
             </connections>
-            <point key="canvasLocation" x="-75" y="38"/>
+            <point key="canvasLocation" x="-115" y="38"/>
         </customView>
     </objects>
 </document>
diff --git a/phpmon/Domain/Menu/StatusMenu.swift b/phpmon/Domain/Menu/StatusMenu.swift
index 5dda5d0..9c0c751 100644
--- a/phpmon/Domain/Menu/StatusMenu.swift
+++ b/phpmon/Domain/Menu/StatusMenu.swift
@@ -8,6 +8,7 @@
 import Cocoa
 
 class StatusMenu : NSMenu {
+    
     func addPhpVersionMenuItems() {
         if PhpEnv.phpInstall.version.error {
             for message in ["mi_php_broken_1", "mi_php_broken_2", "mi_php_broken_3", "mi_php_broken_4"] {
@@ -37,11 +38,13 @@ class StatusMenu : NSMenu {
         self.addItem(NSMenuItem.separator())
     }
     
-    func addOtherMenuItems() {
+    func addFirstAidAndServicesMenuItems() {
+        
         let services = NSMenuItem(title: "mi_other".localized, action: nil, keyEquivalent: "")
+        
         let servicesMenu = NSMenu()
         
-        servicesMenu.addItem(NSMenuItem(title: "mi_help".localized, action: nil, keyEquivalent: ""))
+        servicesMenu.addItem(HeaderView.asMenuItem(text: "mi_first_aid".localized))
         
         if !PhpEnv.shared.availablePhpVersions.contains(PhpEnv.brewPhpVersion) {
             servicesMenu.addItem(NSMenuItem(
@@ -60,19 +63,19 @@ class StatusMenu : NSMenu {
             action: #selector(MainMenu.fixHomebrewPermissions), keyEquivalent: "")
         )
         
-        servicesMenu.addItem(NSMenuItem(title: "mi_services".localized, action: nil, keyEquivalent: ""))
+        servicesMenu.addItem(NSMenuItem.separator())
+        servicesMenu.addItem(HeaderView.asMenuItem(text: "mi_services".localized))
         
         servicesMenu.addItem(NSMenuItem(title: "mi_restart_dnsmasq".localized, action: #selector(MainMenu.restartDnsMasq), keyEquivalent: "d"))
         servicesMenu.addItem(NSMenuItem(title: "mi_restart_php_fpm".localized, action: #selector(MainMenu.restartPhpFpm), keyEquivalent: "p"))
         servicesMenu.addItem(NSMenuItem(title: "mi_restart_nginx".localized, action: #selector(MainMenu.restartNginx), keyEquivalent: "n"))
-        
+        servicesMenu.addItem(NSMenuItem(title: "mi_restart_all_services".localized, action: #selector(MainMenu.restartAllServices), keyEquivalent: "s"))
         servicesMenu.addItem(
             NSMenuItem(title: "mi_stop_all_services".localized, action: #selector(MainMenu.stopAllServices), keyEquivalent: "s"),
             withKeyModifier: [.command, .shift])
         
-        servicesMenu.addItem(NSMenuItem(title: "mi_restart_all_services".localized, action: #selector(MainMenu.restartAllServices), keyEquivalent: "s"))
-        
-        servicesMenu.addItem(NSMenuItem(title: "mi_manual_actions".localized, action: nil, keyEquivalent: ""))
+        servicesMenu.addItem(NSMenuItem.separator())
+        servicesMenu.addItem(HeaderView.asMenuItem(text: "mi_manual_actions".localized))
         
         servicesMenu.addItem(NSMenuItem(title: "mi_php_refresh".localized, action: #selector(MainMenu.reloadPhpMonitorMenu), keyEquivalent: "r"))
         
@@ -137,7 +140,7 @@ class StatusMenu : NSMenu {
         
         // Other
         self.addItem(NSMenuItem.separator())
-        self.addOtherMenuItems()
+        self.addFirstAidAndServicesMenuItems()
     }
     
     private func addSwitchToPhpMenuItems() {
diff --git a/phpmon/Localizable.strings b/phpmon/Localizable.strings
index 579f880..33d2b53 100644
--- a/phpmon/Localizable.strings
+++ b/phpmon/Localizable.strings
@@ -37,8 +37,8 @@
 "mi_upload_max_filesize" = "Max Upload";
 "mi_manual_actions" = "Manual Actions";
 "mi_services" = "Services";
-"mi_help" = "First Aid";
 "mi_other" = "First Aid & Services";
+"mi_first_aid" = "First Aid";
 
 "mi_composer" = "Composer";
 "mi_valet_config" = "Locate Valet folder (.config/valet)";