From 66a8c17f1f521ad921d32f29f1107a493fabed43 Mon Sep 17 00:00:00 2001
From: Nico Verbruggen <mail@nicoverbruggen.be>
Date: Thu, 16 Dec 2021 22:57:37 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20Tweak=20order=20of=20menu=20item?=
 =?UTF-8?q?s=20(#69)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 phpmon/Domain/Menu/MainMenu.swift   |  5 +++
 phpmon/Domain/Menu/StatusMenu.swift | 60 ++++++++++++++---------------
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/phpmon/Domain/Menu/MainMenu.swift b/phpmon/Domain/Menu/MainMenu.swift
index 4ce43c3..1f215d3 100644
--- a/phpmon/Domain/Menu/MainMenu.swift
+++ b/phpmon/Domain/Menu/MainMenu.swift
@@ -128,6 +128,11 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate {
             
             // Add Valet interactions
             menu.addValetMenuItems()
+            menu.addItem(NSMenuItem.separator())
+            
+            // Add services
+            menu.addServicesMenuItems()
+            menu.addItem(NSMenuItem.separator())
             
             // Add information about services & actions
             menu.addPhpConfigurationMenuItems()
diff --git a/phpmon/Domain/Menu/StatusMenu.swift b/phpmon/Domain/Menu/StatusMenu.swift
index 1474623..5f4662c 100644
--- a/phpmon/Domain/Menu/StatusMenu.swift
+++ b/phpmon/Domain/Menu/StatusMenu.swift
@@ -36,35 +36,9 @@ class StatusMenu : NSMenu {
         
         self.addSwitchToPhpMenuItems()
         self.addItem(NSMenuItem.separator())
-        self.addServicesMenuItems()
     }
     
-    private func addSwitchToPhpMenuItems() {
-        var shortcutKey = 1
-        for index in (0..<App.shared.availablePhpVersions.count).reversed() {
-            
-            // Get the short and long version
-            let shortVersion = App.shared.availablePhpVersions[index]
-            let longVersion = App.shared.cachedPhpInstallations[shortVersion]!.longVersion
-            
-            let long = Preferences.preferences[.fullPhpVersionDynamicIcon] as! Bool
-            let versionString = long ? longVersion : shortVersion
-            
-            let action = #selector(MainMenu.switchToPhpVersion(sender:))
-            let brew = (shortVersion == App.shared.brewPhpVersion) ? "php" : "php@\(shortVersion)"
-            let menuItem = PhpMenuItem(
-                title: "\("mi_php_switch".localized) \(versionString) (\(brew))",
-                action: (shortVersion == App.phpInstall?.version.short) ? nil : action, keyEquivalent: "\(shortcutKey)"
-            )
-            
-            menuItem.version = shortVersion
-            shortcutKey = shortcutKey + 1
-            
-            self.addItem(menuItem)
-        }
-    }
-    
-    private func addServicesMenuItems() {
+    func addServicesMenuItems() {
         self.addItem(HeaderView.asMenuItem(text: "mi_active_services".localized))
         
         let services = NSMenuItem(title: "mi_manage_services".localized, action: nil, keyEquivalent: "")
@@ -74,17 +48,16 @@ class StatusMenu : NSMenu {
         servicesMenu.addItem(NSMenuItem(title: "mi_restart_nginx".localized, action: #selector(MainMenu.restartNginx), keyEquivalent: "n"))
         servicesMenu.addItem(
             NSMenuItem(title: "mi_stop_all_services".localized, action: #selector(MainMenu.stopAllServices), keyEquivalent: "s"),
-            withKeyModifier: [.command, .shift]
-        )
+            withKeyModifier: [.command, .shift])
+        servicesMenu.addItem(NSMenuItem(title: "mi_restart_all_services".localized, action: #selector(MainMenu.restartAllServices), keyEquivalent: "s"))
         for item in servicesMenu.items {
             item.target = MainMenu.shared
         }
         self.setSubmenu(servicesMenu, for: services)
         
         self.addForceLoadLatestVersion()
-        
         self.addItem(services)
-        self.addItem(NSMenuItem(title: "mi_restart_all_services".localized, action: #selector(MainMenu.restartAllServices), keyEquivalent: "s"))
+
     }
     
     func addForceLoadLatestVersion() {
@@ -151,6 +124,31 @@ class StatusMenu : NSMenu {
         self.addItem(NSMenuItem(title: "mi_php_refresh".localized, action: #selector(MainMenu.reloadPhpMonitorMenu), keyEquivalent: "r"))
     }
     
+    private func addSwitchToPhpMenuItems() {
+        var shortcutKey = 1
+        for index in (0..<App.shared.availablePhpVersions.count).reversed() {
+            
+            // Get the short and long version
+            let shortVersion = App.shared.availablePhpVersions[index]
+            let longVersion = App.shared.cachedPhpInstallations[shortVersion]!.longVersion
+            
+            let long = Preferences.preferences[.fullPhpVersionDynamicIcon] as! Bool
+            let versionString = long ? longVersion : shortVersion
+            
+            let action = #selector(MainMenu.switchToPhpVersion(sender:))
+            let brew = (shortVersion == App.shared.brewPhpVersion) ? "php" : "php@\(shortVersion)"
+            let menuItem = PhpMenuItem(
+                title: "\("mi_php_switch".localized) \(versionString) (\(brew))",
+                action: (shortVersion == App.phpInstall?.version.short) ? nil : action, keyEquivalent: "\(shortcutKey)"
+            )
+            
+            menuItem.version = shortVersion
+            shortcutKey = shortcutKey + 1
+            
+            self.addItem(menuItem)
+        }
+    }
+    
     private func addExtensionItem(_ phpExtension: PhpExtension, _ shortcutKey: Int) {
         let keyEquivalent = shortcutKey < 9 ? "\(shortcutKey)" : ""