diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 997a0f1..5ce3246 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -51,8 +51,8 @@ C40C7F2927721FF600DDDCDC /* ActivePhpInstallation+Checks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F2727721FF600DDDCDC /* ActivePhpInstallation+Checks.swift */; }; C40C7F3027722E8D00DDDCDC /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F2F27722E8D00DDDCDC /* Logger.swift */; }; C40C7F3127722E8D00DDDCDC /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F2F27722E8D00DDDCDC /* Logger.swift */; }; - C40D88EB27F38D7600C94B40 /* SiteListProxiesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40D88EA27F38D7600C94B40 /* SiteListProxiesCell.swift */; }; - C40D88EC27F38D7600C94B40 /* SiteListProxiesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40D88EA27F38D7600C94B40 /* SiteListProxiesCell.swift */; }; + C40D88EB27F38D7600C94B40 /* DomainListProxiesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40D88EA27F38D7600C94B40 /* DomainListProxiesCell.swift */; }; + C40D88EC27F38D7600C94B40 /* DomainListProxiesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40D88EA27F38D7600C94B40 /* DomainListProxiesCell.swift */; }; C412E5FC25700D5300A1FB67 /* HomebrewPackage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */; }; C415937F27A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */; }; C415938027A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */; }; @@ -73,11 +73,11 @@ C41C1B3E22B0098000E7CF16 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C41C1B3C22B0098000E7CF16 /* Main.storyboard */; }; C41C1B4922B00A9800E7CF16 /* MenuBarImageGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */; }; C41C1B4B22B019FF00E7CF16 /* ActivePhpInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4A22B019FF00E7CF16 /* ActivePhpInstallation.swift */; }; - C41CA5ED2774F8EE00A2C80E /* SiteListVC+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41CA5EC2774F8EE00A2C80E /* SiteListVC+Actions.swift */; }; - C41CA5EE2774F8EE00A2C80E /* SiteListVC+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41CA5EC2774F8EE00A2C80E /* SiteListVC+Actions.swift */; }; + C41CA5ED2774F8EE00A2C80E /* DomainListVC+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41CA5EC2774F8EE00A2C80E /* DomainListVC+Actions.swift */; }; + C41CA5EE2774F8EE00A2C80E /* DomainListVC+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41CA5EC2774F8EE00A2C80E /* DomainListVC+Actions.swift */; }; C41CD0292628D8EE0065BBED /* GlobalKeybindPreference.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41CD0282628D8EE0065BBED /* GlobalKeybindPreference.swift */; }; - C41E871A2763D42300161EE0 /* SiteListVC+ContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41E87192763D42300161EE0 /* SiteListVC+ContextMenu.swift */; }; - C41E871B2763D42300161EE0 /* SiteListVC+ContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41E87192763D42300161EE0 /* SiteListVC+ContextMenu.swift */; }; + C41E871A2763D42300161EE0 /* DomainListVC+ContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41E87192763D42300161EE0 /* DomainListVC+ContextMenu.swift */; }; + C41E871B2763D42300161EE0 /* DomainListVC+ContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41E87192763D42300161EE0 /* DomainListVC+ContextMenu.swift */; }; C4232EE52612526500158FC6 /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = C4232EE42612526500158FC6 /* Credits.html */; }; C42759672627662800093CAE /* NSMenuExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42759662627662800093CAE /* NSMenuExtension.swift */; }; C42759682627662800093CAE /* NSMenuExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42759662627662800093CAE /* NSMenuExtension.swift */; }; @@ -90,15 +90,15 @@ C43A8A1A25D9CD1000591B77 /* Utility.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43A8A1925D9CD1000591B77 /* Utility.swift */; }; C43A8A2025D9D1D700591B77 /* brew.json in Resources */ = {isa = PBXBuildFile; fileRef = C43A8A1F25D9D1D700591B77 /* brew.json */; }; C43A8A2425D9D20D00591B77 /* BrewJsonParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43A8A2325D9D20D00591B77 /* BrewJsonParserTest.swift */; }; - C44067F527E2582B0045BD4E /* SiteListNameCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F427E2582B0045BD4E /* SiteListNameCell.swift */; }; - C44067F727E258410045BD4E /* SiteListPhpCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F627E258410045BD4E /* SiteListPhpCell.swift */; }; - C44067F927E2585E0045BD4E /* SiteListTypeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F827E2585E0045BD4E /* SiteListTypeCell.swift */; }; - C44067FB27E25FD70045BD4E /* SiteListTLSCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067FA27E25FD70045BD4E /* SiteListTLSCell.swift */; }; - C449B4F027EE7FB800C47E8A /* SiteListTLSCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067FA27E25FD70045BD4E /* SiteListTLSCell.swift */; }; - C449B4F127EE7FC200C47E8A /* SiteListNameCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F427E2582B0045BD4E /* SiteListNameCell.swift */; }; - C449B4F227EE7FC400C47E8A /* SiteListPhpCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F627E258410045BD4E /* SiteListPhpCell.swift */; }; - C449B4F327EE7FC600C47E8A /* SiteListTypeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F827E2585E0045BD4E /* SiteListTypeCell.swift */; }; - C449B4F427EE7FC800C47E8A /* SiteListKindCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AC51FB27E27F47008528CA /* SiteListKindCell.swift */; }; + C44067F527E2582B0045BD4E /* DomainListNameCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F427E2582B0045BD4E /* DomainListNameCell.swift */; }; + C44067F727E258410045BD4E /* DomainListPhpCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F627E258410045BD4E /* DomainListPhpCell.swift */; }; + C44067F927E2585E0045BD4E /* DomainListTypeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F827E2585E0045BD4E /* DomainListTypeCell.swift */; }; + C44067FB27E25FD70045BD4E /* DomainListTLSCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067FA27E25FD70045BD4E /* DomainListTLSCell.swift */; }; + C449B4F027EE7FB800C47E8A /* DomainListTLSCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067FA27E25FD70045BD4E /* DomainListTLSCell.swift */; }; + C449B4F127EE7FC200C47E8A /* DomainListNameCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F427E2582B0045BD4E /* DomainListNameCell.swift */; }; + C449B4F227EE7FC400C47E8A /* DomainListPhpCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F627E258410045BD4E /* DomainListPhpCell.swift */; }; + C449B4F327EE7FC600C47E8A /* DomainListTypeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44067F827E2585E0045BD4E /* DomainListTypeCell.swift */; }; + C449B4F427EE7FC800C47E8A /* DomainListKindCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AC51FB27E27F47008528CA /* DomainListKindCell.swift */; }; C44C198D276E3A1C0072762D /* ProgressWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44C198C276E3A1C0072762D /* ProgressWindow.swift */; }; C44C198E276E3A1C0072762D /* ProgressWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44C198C276E3A1C0072762D /* ProgressWindow.swift */; }; C44C1991276E44CB0072762D /* ProgressWindow.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C44C1990276E44CB0072762D /* ProgressWindow.storyboard */; }; @@ -107,11 +107,11 @@ C44CCD4127AFE2FC00CE40E5 /* AlertableError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44CCD3F27AFE2FC00CE40E5 /* AlertableError.swift */; }; C44CCD4927AFF3B700CE40E5 /* MainMenu+Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44CCD4827AFF3B700CE40E5 /* MainMenu+Async.swift */; }; C44CCD4A27AFF3BC00CE40E5 /* MainMenu+Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44CCD4827AFF3B700CE40E5 /* MainMenu+Async.swift */; }; - C464ADAC275A7A3F003FCD53 /* SiteListWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAB275A7A3F003FCD53 /* SiteListWC.swift */; }; - C464ADAD275A7A3F003FCD53 /* SiteListWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAB275A7A3F003FCD53 /* SiteListWC.swift */; }; - C464ADAF275A7A69003FCD53 /* SiteListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAE275A7A69003FCD53 /* SiteListVC.swift */; }; - C464ADB0275A7A6A003FCD53 /* SiteListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAE275A7A69003FCD53 /* SiteListVC.swift */; }; - C464ADB2275A87CA003FCD53 /* SiteListCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADB1275A87CA003FCD53 /* SiteListCellProtocol.swift */; }; + C464ADAC275A7A3F003FCD53 /* DomainListWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAB275A7A3F003FCD53 /* DomainListWC.swift */; }; + C464ADAD275A7A3F003FCD53 /* DomainListWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAB275A7A3F003FCD53 /* DomainListWC.swift */; }; + C464ADAF275A7A69003FCD53 /* DomainListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAE275A7A69003FCD53 /* DomainListVC.swift */; }; + C464ADB0275A7A6A003FCD53 /* DomainListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADAE275A7A69003FCD53 /* DomainListVC.swift */; }; + C464ADB2275A87CA003FCD53 /* DomainListCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADB1275A87CA003FCD53 /* DomainListCellProtocol.swift */; }; C46FA23F246C358E00944F05 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C46FA23E246C358E00944F05 /* StringExtension.swift */; }; C473319F2470923A009A0597 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C473319E2470923A009A0597 /* Localizable.strings */; }; C47331A2247093B7009A0597 /* StatusMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = C47331A1247093B7009A0597 /* StatusMenu.swift */; }; @@ -136,7 +136,7 @@ C4998F0A2617633900B2526E /* PrefsWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4998F092617633900B2526E /* PrefsWC.swift */; }; C4998F0B2617633900B2526E /* PrefsWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4998F092617633900B2526E /* PrefsWC.swift */; }; C49E171F27A5736E00787921 /* PMServicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49E171E27A5736E00787921 /* PMServicesView.swift */; }; - C4AC51FC27E27F47008528CA /* SiteListKindCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AC51FB27E27F47008528CA /* SiteListKindCell.swift */; }; + C4AC51FC27E27F47008528CA /* DomainListKindCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AC51FB27E27F47008528CA /* DomainListKindCell.swift */; }; C4ACA38F25C754C100060C66 /* PhpExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4ACA38E25C754C100060C66 /* PhpExtension.swift */; }; C4AF9F71275445FF00D44ED0 /* valet-config.json in Resources */ = {isa = PBXBuildFile; fileRef = C4AF9F70275445FF00D44ED0 /* valet-config.json */; }; C4AF9F72275445FF00D44ED0 /* valet-config.json in Resources */ = {isa = PBXBuildFile; fileRef = C4AF9F70275445FF00D44ED0 /* valet-config.json */; }; @@ -180,7 +180,7 @@ C4D89BC62783C99400A02B68 /* ComposerJson.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D89BC52783C99400A02B68 /* ComposerJson.swift */; }; C4D936C927E3EB6100BD69FE /* PhpHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D936C827E3EB6100BD69FE /* PhpHelper.swift */; }; C4D936CA27E3EB6100BD69FE /* PhpHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D936C827E3EB6100BD69FE /* PhpHelper.swift */; }; - C4D936CB27E3EE4A00BD69FE /* SiteListCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADB1275A87CA003FCD53 /* SiteListCellProtocol.swift */; }; + C4D936CB27E3EE4A00BD69FE /* DomainListCellProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C464ADB1275A87CA003FCD53 /* DomainListCellProtocol.swift */; }; C4D9ADBF277610E1007277F4 /* PhpSwitcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D9ADBE277610E1007277F4 /* PhpSwitcher.swift */; }; C4D9ADC0277610E1007277F4 /* PhpSwitcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D9ADBE277610E1007277F4 /* PhpSwitcher.swift */; }; C4D9ADC8277611A0007277F4 /* InternalSwitcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D9ADC7277611A0007277F4 /* InternalSwitcher.swift */; }; @@ -271,7 +271,7 @@ C40C7F1D2772136000DDDCDC /* PhpEnv.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpEnv.swift; sourceTree = ""; }; C40C7F2727721FF600DDDCDC /* ActivePhpInstallation+Checks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ActivePhpInstallation+Checks.swift"; sourceTree = ""; }; C40C7F2F27722E8D00DDDCDC /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = ""; }; - C40D88EA27F38D7600C94B40 /* SiteListProxiesCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteListProxiesCell.swift; sourceTree = ""; }; + C40D88EA27F38D7600C94B40 /* DomainListProxiesCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DomainListProxiesCell.swift; sourceTree = ""; }; C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomebrewPackage.swift; sourceTree = ""; }; C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpFrameworks.swift; sourceTree = ""; }; C415D3B62770F294005EF286 /* Actions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Actions.swift; sourceTree = ""; }; @@ -289,9 +289,9 @@ C41C1B4022B0098000E7CF16 /* phpmon.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = phpmon.entitlements; sourceTree = ""; }; C41C1B4822B00A9800E7CF16 /* MenuBarImageGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarImageGenerator.swift; sourceTree = ""; }; C41C1B4A22B019FF00E7CF16 /* ActivePhpInstallation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivePhpInstallation.swift; sourceTree = ""; }; - C41CA5EC2774F8EE00A2C80E /* SiteListVC+Actions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SiteListVC+Actions.swift"; sourceTree = ""; }; + C41CA5EC2774F8EE00A2C80E /* DomainListVC+Actions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DomainListVC+Actions.swift"; sourceTree = ""; }; C41CD0282628D8EE0065BBED /* GlobalKeybindPreference.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlobalKeybindPreference.swift; sourceTree = ""; }; - C41E87192763D42300161EE0 /* SiteListVC+ContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SiteListVC+ContextMenu.swift"; sourceTree = ""; }; + C41E87192763D42300161EE0 /* DomainListVC+ContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DomainListVC+ContextMenu.swift"; sourceTree = ""; }; C4232EE42612526500158FC6 /* Credits.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = Credits.html; sourceTree = ""; }; C42759662627662800093CAE /* NSMenuExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSMenuExtension.swift; sourceTree = ""; }; C42C49DA27C2806F0074ABAC /* MainMenu+FixMyValet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMenu+FixMyValet.swift"; sourceTree = ""; }; @@ -302,17 +302,17 @@ C43A8A1925D9CD1000591B77 /* Utility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utility.swift; sourceTree = ""; }; C43A8A1F25D9D1D700591B77 /* brew.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = brew.json; sourceTree = ""; }; C43A8A2325D9D20D00591B77 /* BrewJsonParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrewJsonParserTest.swift; sourceTree = ""; }; - C44067F427E2582B0045BD4E /* SiteListNameCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteListNameCell.swift; sourceTree = ""; }; - C44067F627E258410045BD4E /* SiteListPhpCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteListPhpCell.swift; sourceTree = ""; }; - C44067F827E2585E0045BD4E /* SiteListTypeCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteListTypeCell.swift; sourceTree = ""; }; - C44067FA27E25FD70045BD4E /* SiteListTLSCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteListTLSCell.swift; sourceTree = ""; }; + C44067F427E2582B0045BD4E /* DomainListNameCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainListNameCell.swift; sourceTree = ""; }; + C44067F627E258410045BD4E /* DomainListPhpCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainListPhpCell.swift; sourceTree = ""; }; + C44067F827E2585E0045BD4E /* DomainListTypeCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DomainListTypeCell.swift; sourceTree = ""; }; + C44067FA27E25FD70045BD4E /* DomainListTLSCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DomainListTLSCell.swift; sourceTree = ""; }; C44C198C276E3A1C0072762D /* ProgressWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressWindow.swift; sourceTree = ""; }; C44C1990276E44CB0072762D /* ProgressWindow.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ProgressWindow.storyboard; sourceTree = ""; }; C44CCD3F27AFE2FC00CE40E5 /* AlertableError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertableError.swift; sourceTree = ""; }; C44CCD4827AFF3B700CE40E5 /* MainMenu+Async.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMenu+Async.swift"; sourceTree = ""; }; - C464ADAB275A7A3F003FCD53 /* SiteListWC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteListWC.swift; sourceTree = ""; }; - C464ADAE275A7A69003FCD53 /* SiteListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteListVC.swift; sourceTree = ""; }; - C464ADB1275A87CA003FCD53 /* SiteListCellProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteListCellProtocol.swift; sourceTree = ""; }; + C464ADAB275A7A3F003FCD53 /* DomainListWC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainListWC.swift; sourceTree = ""; }; + C464ADAE275A7A69003FCD53 /* DomainListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainListVC.swift; sourceTree = ""; }; + C464ADB1275A87CA003FCD53 /* DomainListCellProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainListCellProtocol.swift; sourceTree = ""; }; C46FA23E246C358E00944F05 /* StringExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtension.swift; sourceTree = ""; }; C473319E2470923A009A0597 /* Localizable.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = ""; }; C47331A1247093B7009A0597 /* StatusMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusMenu.swift; sourceTree = ""; }; @@ -331,7 +331,7 @@ C4930849279F331F009C240B /* AddSiteVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSiteVC.swift; sourceTree = ""; }; C4998F092617633900B2526E /* PrefsWC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefsWC.swift; sourceTree = ""; }; C49E171E27A5736E00787921 /* PMServicesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PMServicesView.swift; sourceTree = ""; }; - C4AC51FB27E27F47008528CA /* SiteListKindCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteListKindCell.swift; sourceTree = ""; }; + C4AC51FB27E27F47008528CA /* DomainListKindCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DomainListKindCell.swift; sourceTree = ""; }; C4ACA38E25C754C100060C66 /* PhpExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpExtension.swift; sourceTree = ""; }; C4AF9F70275445FF00D44ED0 /* valet-config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "valet-config.json"; sourceTree = ""; }; C4AF9F76275447F100D44ED0 /* ValetConfigParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValetConfigParserTest.swift; sourceTree = ""; }; @@ -569,7 +569,7 @@ C4B13B1D25C4915000548C3A /* App */, C4D9ADBD27761084007277F4 /* PHP */, C47331A0247093AC009A0597 /* Menu */, - C464ADAA275A7A25003FCD53 /* SiteList */, + C464ADAA275A7A25003FCD53 /* DomainList */, 5420395726135DB800FB00FA /* Preferences */, C44C198F276E3A380072762D /* Progress */, C4C8E81D276F5686003AC782 /* Watcher */, @@ -581,13 +581,13 @@ C44067F327E256560045BD4E /* Cells */ = { isa = PBXGroup; children = ( - C464ADB1275A87CA003FCD53 /* SiteListCellProtocol.swift */, - C44067FA27E25FD70045BD4E /* SiteListTLSCell.swift */, - C44067F427E2582B0045BD4E /* SiteListNameCell.swift */, - C44067F627E258410045BD4E /* SiteListPhpCell.swift */, - C44067F827E2585E0045BD4E /* SiteListTypeCell.swift */, - C4AC51FB27E27F47008528CA /* SiteListKindCell.swift */, - C40D88EA27F38D7600C94B40 /* SiteListProxiesCell.swift */, + C464ADB1275A87CA003FCD53 /* DomainListCellProtocol.swift */, + C44067FA27E25FD70045BD4E /* DomainListTLSCell.swift */, + C44067F427E2582B0045BD4E /* DomainListNameCell.swift */, + C44067F627E258410045BD4E /* DomainListPhpCell.swift */, + C44067F827E2585E0045BD4E /* DomainListTypeCell.swift */, + C4AC51FB27E27F47008528CA /* DomainListKindCell.swift */, + C40D88EA27F38D7600C94B40 /* DomainListProxiesCell.swift */, ); path = Cells; sourceTree = ""; @@ -610,17 +610,17 @@ path = Errors; sourceTree = ""; }; - C464ADAA275A7A25003FCD53 /* SiteList */ = { + C464ADAA275A7A25003FCD53 /* DomainList */ = { isa = PBXGroup; children = ( C44067F327E256560045BD4E /* Cells */, - C464ADAB275A7A3F003FCD53 /* SiteListWC.swift */, - C464ADAE275A7A69003FCD53 /* SiteListVC.swift */, - C41E87192763D42300161EE0 /* SiteListVC+ContextMenu.swift */, - C41CA5EC2774F8EE00A2C80E /* SiteListVC+Actions.swift */, + C464ADAB275A7A3F003FCD53 /* DomainListWC.swift */, + C464ADAE275A7A69003FCD53 /* DomainListVC.swift */, + C41E87192763D42300161EE0 /* DomainListVC+ContextMenu.swift */, + C41CA5EC2774F8EE00A2C80E /* DomainListVC+Actions.swift */, C4930849279F331F009C240B /* AddSiteVC.swift */, ); - path = SiteList; + path = DomainList; sourceTree = ""; }; C47331A0247093AC009A0597 /* Menu */ = { @@ -991,21 +991,21 @@ C4E4404627C56F4700D225E1 /* ValetSite.swift in Sources */, C4EC1E68279DE0540010F296 /* ServicesView.swift in Sources */, C4F2E43A2752F7D00020E974 /* PhpInstallation.swift in Sources */, - C41E871A2763D42300161EE0 /* SiteListVC+ContextMenu.swift in Sources */, + C41E871A2763D42300161EE0 /* DomainListVC+ContextMenu.swift in Sources */, C48D0CA325CC992000CC7490 /* StatsView.swift in Sources */, C40C7F2827721FF600DDDCDC /* ActivePhpInstallation+Checks.swift in Sources */, C4EE55A927708B9E001DF387 /* PMHeaderView.swift in Sources */, C41C02A927E61A65009F26CB /* ValetSite+Fake.swift in Sources */, C4F2E4372752F0870020E974 /* HomebrewDiagnostics.swift in Sources */, - C40D88EB27F38D7600C94B40 /* SiteListProxiesCell.swift in Sources */, + C40D88EB27F38D7600C94B40 /* DomainListProxiesCell.swift in Sources */, C4CCBA6C275C567B008C7055 /* PMWindowController.swift in Sources */, C4B585442770FE3900DA4FBE /* Command.swift in Sources */, - C44067F527E2582B0045BD4E /* SiteListNameCell.swift in Sources */, + C44067F527E2582B0045BD4E /* DomainListNameCell.swift in Sources */, C41CD0292628D8EE0065BBED /* GlobalKeybindPreference.swift in Sources */, C4EE55AB27708B9E001DF387 /* Preview.swift in Sources */, - C44067F727E258410045BD4E /* SiteListPhpCell.swift in Sources */, + C44067F727E258410045BD4E /* DomainListPhpCell.swift in Sources */, C415D3B72770F294005EF286 /* Actions.swift in Sources */, - C4AC51FC27E27F47008528CA /* SiteListKindCell.swift in Sources */, + C4AC51FC27E27F47008528CA /* DomainListKindCell.swift in Sources */, C44C198D276E3A1C0072762D /* ProgressWindow.swift in Sources */, 54D9E0B827E4F51E003B9AD9 /* KeyCombo.swift in Sources */, C4C3ED4327834C5200AB15D8 /* CustomPrefs.swift in Sources */, @@ -1023,7 +1023,7 @@ 54D9E0B227E4F51E003B9AD9 /* HotKeysController.swift in Sources */, C4811D2A22D70F9A00B5F6B3 /* MainMenu.swift in Sources */, C40C7F3027722E8D00DDDCDC /* Logger.swift in Sources */, - C41CA5ED2774F8EE00A2C80E /* SiteListVC+Actions.swift in Sources */, + C41CA5ED2774F8EE00A2C80E /* DomainListVC+Actions.swift in Sources */, C412E5FC25700D5300A1FB67 /* HomebrewPackage.swift in Sources */, C4D9ADBF277610E1007277F4 /* PhpSwitcher.swift in Sources */, C4068CAA27B0890D00544CD5 /* MenuBarIcons.swift in Sources */, @@ -1032,11 +1032,11 @@ C415D3E82770F692005EF286 /* AppDelegate+InterApp.swift in Sources */, C41C1B3722B0097F00E7CF16 /* AppDelegate.swift in Sources */, C42759672627662800093CAE /* NSMenuExtension.swift in Sources */, - C464ADAF275A7A69003FCD53 /* SiteListVC.swift in Sources */, + C464ADAF275A7A69003FCD53 /* DomainListVC.swift in Sources */, C44CCD4927AFF3B700CE40E5 /* MainMenu+Async.swift in Sources */, C4C1019B27C65C6F001FACC2 /* Process.swift in Sources */, C4EC1E73279DFCF40010F296 /* Events.swift in Sources */, - C44067FB27E25FD70045BD4E /* SiteListTLSCell.swift in Sources */, + C44067FB27E25FD70045BD4E /* DomainListTLSCell.swift in Sources */, C4927F0B27B2DFC200C55AFD /* Errors.swift in Sources */, C4B5853E2770FE3900DA4FBE /* Paths.swift in Sources */, C41C1B4B22B019FF00E7CF16 /* ActivePhpInstallation.swift in Sources */, @@ -1056,15 +1056,15 @@ 54D9E0B627E4F51E003B9AD9 /* HotKey.swift in Sources */, C4D936C927E3EB6100BD69FE /* PhpHelper.swift in Sources */, C47331A2247093B7009A0597 /* StatusMenu.swift in Sources */, - C44067F927E2585E0045BD4E /* SiteListTypeCell.swift in Sources */, + C44067F927E2585E0045BD4E /* DomainListTypeCell.swift in Sources */, 54D9E0BA27E4F51E003B9AD9 /* ModifierFlagsExtension.swift in Sources */, C4C3ED412783497000AB15D8 /* MainMenu+Startup.swift in Sources */, C4D89BC62783C99400A02B68 /* ComposerJson.swift in Sources */, C46FA23F246C358E00944F05 /* StringExtension.swift in Sources */, C4B97B75275CF08C003F3378 /* AppDelegate+MenuOutlets.swift in Sources */, C41C02A627E60D7A009F26CB /* SiteScanner.swift in Sources */, - C464ADAC275A7A3F003FCD53 /* SiteListWC.swift in Sources */, - C464ADB2275A87CA003FCD53 /* SiteListCellProtocol.swift in Sources */, + C464ADAC275A7A3F003FCD53 /* DomainListWC.swift in Sources */, + C464ADB2275A87CA003FCD53 /* DomainListCellProtocol.swift in Sources */, C4EE188422D3386B00E126E5 /* Constants.swift in Sources */, C493084A279F331F009C240B /* AddSiteVC.swift in Sources */, C4DEB7D427A5D60B00834718 /* Stats.swift in Sources */, @@ -1075,10 +1075,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C449B4F427EE7FC800C47E8A /* SiteListKindCell.swift in Sources */, + C449B4F427EE7FC800C47E8A /* DomainListKindCell.swift in Sources */, 54EAC806262F212B0092D14E /* GlobalKeybindPreference.swift in Sources */, C4EE55AE27708B9E001DF387 /* PMStatsView.swift in Sources */, - C41CA5EE2774F8EE00A2C80E /* SiteListVC+Actions.swift in Sources */, + C41CA5EE2774F8EE00A2C80E /* DomainListVC+Actions.swift in Sources */, 54D9E0B727E4F51E003B9AD9 /* HotKey.swift in Sources */, C4F780C425D80B75000DBC97 /* MainMenu.swift in Sources */, 54FCFD2B276C8AA4004CE748 /* CheckboxPreferenceView.swift in Sources */, @@ -1096,7 +1096,7 @@ C4068CA827B07A1300544CD5 /* SelectPreferenceView.swift in Sources */, C4F780CE25D80B75000DBC97 /* LocalNotification.swift in Sources */, C40C7F2927721FF600DDDCDC /* ActivePhpInstallation+Checks.swift in Sources */, - C449B4F027EE7FB800C47E8A /* SiteListTLSCell.swift in Sources */, + C449B4F027EE7FB800C47E8A /* DomainListTLSCell.swift in Sources */, C4FBFC532616485F00CDB8E1 /* PhpVersionDetectionTest.swift in Sources */, C43A8A2425D9D20D00591B77 /* BrewJsonParserTest.swift in Sources */, C4F780CA25D80B75000DBC97 /* HomebrewPackage.swift in Sources */, @@ -1118,11 +1118,11 @@ C48D6C75279CD3E400F26D7E /* PhpVersionNumberTest.swift in Sources */, C43603A1275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */, C42759682627662800093CAE /* NSMenuExtension.swift in Sources */, - C4D936CB27E3EE4A00BD69FE /* SiteListCellProtocol.swift in Sources */, + C4D936CB27E3EE4A00BD69FE /* DomainListCellProtocol.swift in Sources */, C4B97B76275CF08C003F3378 /* AppDelegate+MenuOutlets.swift in Sources */, C4F780CD25D80B75000DBC97 /* Alert.swift in Sources */, C481F79726164A78004FBCFF /* PrefsVC.swift in Sources */, - C41E871B2763D42300161EE0 /* SiteListVC+ContextMenu.swift in Sources */, + C41E871B2763D42300161EE0 /* DomainListVC+ContextMenu.swift in Sources */, C40C7F3127722E8D00DDDCDC /* Logger.swift in Sources */, C4068CAB27B0890D00544CD5 /* MenuBarIcons.swift in Sources */, C4F30B09278E1A0E00755FCE /* CustomPrefs.swift in Sources */, @@ -1133,14 +1133,14 @@ C417DC75277614690015E6EE /* Helpers.swift in Sources */, C4080FF727BD8C6400BF2C6B /* BetterAlert.swift in Sources */, C4B97B7C275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */, - C40D88EC27F38D7600C94B40 /* SiteListProxiesCell.swift in Sources */, + C40D88EC27F38D7600C94B40 /* DomainListProxiesCell.swift in Sources */, 54D9E0B327E4F51E003B9AD9 /* HotKeysController.swift in Sources */, C4B97B79275CF1B5003F3378 /* App+ActivationPolicy.swift in Sources */, C4CE3BBB27B324230086CA49 /* MainMenu+Switcher.swift in Sources */, C4F7809C25D80344000DBC97 /* CommandTest.swift in Sources */, C44CCD4127AFE2FC00CE40E5 /* AlertableError.swift in Sources */, C4D936CA27E3EB6100BD69FE /* PhpHelper.swift in Sources */, - C449B4F127EE7FC200C47E8A /* SiteListNameCell.swift in Sources */, + C449B4F127EE7FC200C47E8A /* DomainListNameCell.swift in Sources */, C4F780BA25D80B62000DBC97 /* AppDelegate.swift in Sources */, 54FCFD31276C8DA4004CE748 /* HotkeyPreferenceView.swift in Sources */, C4998F0B2617633900B2526E /* PrefsWC.swift in Sources */, @@ -1150,7 +1150,7 @@ C44C198E276E3A1C0072762D /* ProgressWindow.swift in Sources */, C415938027A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */, C4D9ADC9277611A0007277F4 /* InternalSwitcher.swift in Sources */, - C449B4F227EE7FC400C47E8A /* SiteListPhpCell.swift in Sources */, + C449B4F227EE7FC400C47E8A /* DomainListPhpCell.swift in Sources */, C42CFB1A27DFE8BD00862737 /* NginxConfigParserTest.swift in Sources */, C4F30B0B278E203C00755FCE /* MainMenu+Startup.swift in Sources */, C40B24F227A310770018C7D2 /* Events.swift in Sources */, @@ -1164,7 +1164,7 @@ C4927F0C27B2DFC200C55AFD /* Errors.swift in Sources */, C4E4404727C56F4700D225E1 /* ValetSite.swift in Sources */, C44CCD4A27AFF3BC00CE40E5 /* MainMenu+Async.swift in Sources */, - C449B4F327EE7FC600C47E8A /* SiteListTypeCell.swift in Sources */, + C449B4F327EE7FC600C47E8A /* DomainListTypeCell.swift in Sources */, C48D6C71279CD2AC00F26D7E /* PhpVersionNumber.swift in Sources */, C41C02AB27E61CB3009F26CB /* ValetSite+Fake.swift in Sources */, C4F780C925D80B75000DBC97 /* StringExtension.swift in Sources */, @@ -1172,10 +1172,10 @@ C481F79A26164A7C004FBCFF /* Preferences.swift in Sources */, C4E0F7EE27BEBDA9007475F2 /* NSWindowExtension.swift in Sources */, C4B585422770FE3900DA4FBE /* Shell.swift in Sources */, - C464ADAD275A7A3F003FCD53 /* SiteListWC.swift in Sources */, + C464ADAD275A7A3F003FCD53 /* DomainListWC.swift in Sources */, C40C7F1F2772136000DDDCDC /* PhpEnv.swift in Sources */, C4F780CB25D80B75000DBC97 /* StatsView.swift in Sources */, - C464ADB0275A7A6A003FCD53 /* SiteListVC.swift in Sources */, + C464ADB0275A7A6A003FCD53 /* DomainListVC.swift in Sources */, C43A8A1A25D9CD1000591B77 /* Utility.swift in Sources */, C418898A275FE8CB001EF227 /* Filesystem.swift in Sources */, C4F780C625D80B75000DBC97 /* XibLoadable.swift in Sources */, diff --git a/phpmon/Domain/App/App.swift b/phpmon/Domain/App/App.swift index 256690d..c0f22f6 100644 --- a/phpmon/Domain/App/App.swift +++ b/phpmon/Domain/App/App.swift @@ -44,7 +44,7 @@ class App { var preferencesWindowController: PrefsWC? = nil /** The window controller of the currently active site list window. */ - var siteListWindowController: SiteListWC? = nil + var domainListWindowController: DomainListWC? = nil /** List of detected (installed) applications that PHP Monitor can work with. */ var detectedApplications: [Application] = [] diff --git a/phpmon/Domain/App/AppDelegate+MenuOutlets.swift b/phpmon/Domain/App/AppDelegate+MenuOutlets.swift index 123dc94..6d48bfb 100644 --- a/phpmon/Domain/App/AppDelegate+MenuOutlets.swift +++ b/phpmon/Domain/App/AppDelegate+MenuOutlets.swift @@ -26,15 +26,15 @@ extension AppDelegate { // MARK: - Menu Interactions @IBAction func addSiteLinkPressed(_ sender: Any) { - SiteListVC.show() + DomainListVC.show() - guard let windowController = App.shared.siteListWindowController else { return } + guard let windowController = App.shared.domainListWindowController else { return } windowController.pressedAddLink(nil) } - @IBAction func reloadSiteListPressed(_ sender: Any) { - let vc = App.shared.siteListWindowController? - .window?.contentViewController as? SiteListVC + @IBAction func reloadDomainListPressed(_ sender: Any) { + let vc = App.shared.domainListWindowController? + .window?.contentViewController as? DomainListVC if vc != nil { // If the view exists, directly reload the list of sites @@ -46,9 +46,9 @@ extension AppDelegate { } @IBAction func focusSearchField(_ sender: Any) { - SiteListVC.show() + DomainListVC.show() - guard let windowController = App.shared.siteListWindowController else { return } + guard let windowController = App.shared.domainListWindowController else { return } windowController.searchToolbarItem.searchField.becomeFirstResponder() } diff --git a/phpmon/Domain/App/Base.lproj/Main.storyboard b/phpmon/Domain/App/Base.lproj/Main.storyboard index d022ac1..eb69935 100644 --- a/phpmon/Domain/App/Base.lproj/Main.storyboard +++ b/phpmon/Domain/App/Base.lproj/Main.storyboard @@ -60,16 +60,16 @@ - + - + - + @@ -383,7 +383,7 @@ - + @@ -790,10 +790,10 @@ Gw - + - + @@ -805,7 +805,7 @@ Gw - + @@ -825,7 +825,7 @@ Gw - + @@ -861,7 +861,7 @@ Gw - + @@ -910,7 +910,7 @@ Gw - + @@ -965,7 +965,7 @@ Gw - + @@ -1002,12 +1002,12 @@ Gw - - + + - + @@ -1015,7 +1015,7 @@ Gw - + @@ -1038,66 +1038,6 @@ Gw - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1111,7 +1051,7 @@ Gw - + @@ -1120,7 +1060,7 @@ Gw - + @@ -1154,7 +1094,6 @@ Gw - diff --git a/phpmon/Domain/App/InterAppHandler.swift b/phpmon/Domain/App/InterAppHandler.swift index c244bad..21c6503 100644 --- a/phpmon/Domain/App/InterAppHandler.swift +++ b/phpmon/Domain/App/InterAppHandler.swift @@ -23,7 +23,7 @@ class InterApp { static func getCommands() -> [InterApp.Action] { return [ InterApp.Action(command: "list", action: { _ in - SiteListVC.show() + DomainListVC.show() }), InterApp.Action(command: "services/stop", action: { _ in MainMenu.shared.stopAllServices() diff --git a/phpmon/Domain/SiteList/AddSiteVC.swift b/phpmon/Domain/DomainList/AddSiteVC.swift similarity index 77% rename from phpmon/Domain/SiteList/AddSiteVC.swift rename to phpmon/Domain/DomainList/AddSiteVC.swift index 1c3b188..ce4112d 100644 --- a/phpmon/Domain/SiteList/AddSiteVC.swift +++ b/phpmon/Domain/DomainList/AddSiteVC.swift @@ -37,10 +37,10 @@ class AddSiteVC: NSViewController, NSTextFieldDelegate { // MARK: - Localisation func loadStaticLocalisedStrings() { - textFieldTitle.stringValue = "site_list.add.link_folder".localized - linkName.placeholderString = "site_list.add.domain_name_placeholder".localized - textFieldSecure.stringValue = "site_list.add.secure_description".localized - buttonCancel.stringValue = "site_list.add.cancel".localized + textFieldTitle.stringValue = "domain_list.add.link_folder".localized + linkName.placeholderString = "domain_list.add.domain_name_placeholder".localized + textFieldSecure.stringValue = "domain_list.add.secure_description".localized + buttonCancel.stringValue = "domain_list.add.cancel".localized } // MARK: - Outlet Interactions @@ -52,10 +52,10 @@ class AddSiteVC: NSViewController, NSTextFieldDelegate { if !FileManager.default.fileExists(atPath: path) { Alert.confirm( onWindow: self.view.window!, - messageText: "site_list.alert.folder_missing.title".localized, - informativeText: "site_list.alert.folder_missing.desc".localized, - buttonTitle: "site_list.alert.folder_missing.cancel".localized, - secondButtonTitle: "site_list.alert.folder_missing.return".localized, + messageText: "domain_list.alert.folder_missing.title".localized, + informativeText: "domain_list.alert.folder_missing.desc".localized, + buttonTitle: "domain_list.alert.folder_missing.cancel".localized, + secondButtonTitle: "domain_list.alert.folder_missing.return".localized, onFirstButtonPressed: { self.dismissView(outcome: .cancel) } @@ -70,12 +70,12 @@ class AddSiteVC: NSViewController, NSTextFieldDelegate { self.dismissView(outcome: .OK) // Reset search - App.shared.siteListWindowController? + App.shared.domainListWindowController? .searchToolbarItem .searchField.stringValue = "" // Add the new item and scrolls to it - App.shared.siteListWindowController? + App.shared.domainListWindowController? .contentVC .addedNewSite( name: name, @@ -102,13 +102,13 @@ class AddSiteVC: NSViewController, NSTextFieldDelegate { private func isValidLinkName(_ name: String) -> Bool { if self.linkName.stringValue.isEmpty { self.textFieldError.isHidden = false - self.textFieldError.stringValue = "site_list.add.errors.empty".localized + self.textFieldError.stringValue = "domain_list.add.errors.empty".localized return false } if Valet.shared.sites.contains(where: { $0.name == name }) { self.textFieldError.isHidden = false - self.textFieldError.stringValue = "site_list.add.errors.already_exists".localized + self.textFieldError.stringValue = "domain_list.add.errors.already_exists".localized return false } @@ -125,13 +125,13 @@ class AddSiteVC: NSViewController, NSTextFieldDelegate { } func updatePreview() { - buttonSecure.title = "site_list.add.secure_after_creation" + buttonSecure.title = "domain_list.add.secure_after_creation" .localized( self.linkName.stringValue, Valet.shared.config.tld ) - previewText.stringValue = "site_list.add.folder_available" + previewText.stringValue = "domain_list.add.folder_available" .localized( self.buttonSecure.state == .on ? "https" : "http", self.linkName.stringValue, diff --git a/phpmon/Domain/SiteList/Cells/SiteListCellProtocol.swift b/phpmon/Domain/DomainList/Cells/DomainListCellProtocol.swift similarity index 75% rename from phpmon/Domain/SiteList/Cells/SiteListCellProtocol.swift rename to phpmon/Domain/DomainList/Cells/DomainListCellProtocol.swift index a75808c..3694629 100644 --- a/phpmon/Domain/SiteList/Cells/SiteListCellProtocol.swift +++ b/phpmon/Domain/DomainList/Cells/DomainListCellProtocol.swift @@ -1,5 +1,5 @@ // -// SiteListCellProtocol.swift +// DomainListCellProtocol.swift // PHP Monitor // // Created by Nico Verbruggen on 03/12/2021. @@ -9,6 +9,6 @@ import Cocoa import AppKit -protocol SiteListCellProtocol { +protocol DomainListCellProtocol { func populateCell(with site: ValetSite) } diff --git a/phpmon/Domain/SiteList/Cells/SiteListKindCell.swift b/phpmon/Domain/DomainList/Cells/DomainListKindCell.swift similarity index 84% rename from phpmon/Domain/SiteList/Cells/SiteListKindCell.swift rename to phpmon/Domain/DomainList/Cells/DomainListKindCell.swift index 6cdb823..d42913e 100644 --- a/phpmon/Domain/SiteList/Cells/SiteListKindCell.swift +++ b/phpmon/Domain/DomainList/Cells/DomainListKindCell.swift @@ -1,5 +1,5 @@ // -// SiteListTypeCell.swift +// DomainListTypeCell.swift // PHP Monitor // // Created by Nico Verbruggen on 16/03/2022. @@ -9,9 +9,9 @@ import Cocoa import AppKit -class SiteListKindCell: NSTableCellView, SiteListCellProtocol +class DomainListKindCell: NSTableCellView, DomainListCellProtocol { - static let reusableName = "siteListKindCell" + static let reusableName = "domainListKindCell" @IBOutlet weak var imageViewType: NSImageView! diff --git a/phpmon/Domain/SiteList/Cells/SiteListNameCell.swift b/phpmon/Domain/DomainList/Cells/DomainListNameCell.swift similarity index 81% rename from phpmon/Domain/SiteList/Cells/SiteListNameCell.swift rename to phpmon/Domain/DomainList/Cells/DomainListNameCell.swift index b444cd1..5c7c1e3 100644 --- a/phpmon/Domain/SiteList/Cells/SiteListNameCell.swift +++ b/phpmon/Domain/DomainList/Cells/DomainListNameCell.swift @@ -1,5 +1,5 @@ // -// SiteListNameCell.swift +// DomainListNameCell.swift // PHP Monitor // // Created by Nico Verbruggen on 16/03/2022. @@ -9,9 +9,9 @@ import Cocoa import AppKit -class SiteListNameCell: NSTableCellView, SiteListCellProtocol +class DomainListNameCell: NSTableCellView, DomainListCellProtocol { - static let reusableName = "siteListNameCell" + static let reusableName = "domainListNameCell" @IBOutlet weak var labelSiteName: NSTextField! @IBOutlet weak var labelPathName: NSTextField! diff --git a/phpmon/Domain/SiteList/Cells/SiteListPhpCell.swift b/phpmon/Domain/DomainList/Cells/DomainListPhpCell.swift similarity index 90% rename from phpmon/Domain/SiteList/Cells/SiteListPhpCell.swift rename to phpmon/Domain/DomainList/Cells/DomainListPhpCell.swift index 299a0cb..e1aa67c 100644 --- a/phpmon/Domain/SiteList/Cells/SiteListPhpCell.swift +++ b/phpmon/Domain/DomainList/Cells/DomainListPhpCell.swift @@ -1,5 +1,5 @@ // -// SiteListPhpCell.swift +// DomainListPhpCell.swift // PHP Monitor // // Created by Nico Verbruggen on 16/03/2022. @@ -9,9 +9,9 @@ import Cocoa import AppKit -class SiteListPhpCell: NSTableCellView, SiteListCellProtocol +class DomainListPhpCell: NSTableCellView, DomainListCellProtocol { - static let reusableName = "siteListPhpCell" + static let reusableName = "domainListPhpCell" var site: ValetSite? = nil @@ -72,7 +72,7 @@ class SiteListPhpCell: NSTableCellView, SiteListCellProtocol } // Site is not isolated, show options to switch global PHP version - alert.beginSheetModal(for: App.shared.siteListWindowController!.window!) { response in + alert.beginSheetModal(for: App.shared.domainListWindowController!.window!) { response in if response.rawValue > NSApplication.ModalResponse.alertFirstButtonReturn.rawValue { if map.keys.contains(response.rawValue) { let version = map[response.rawValue]! @@ -83,7 +83,7 @@ class SiteListPhpCell: NSTableCellView, SiteListCellProtocol } } else { // Site is isolated, do not show any options to switch - alert.beginSheetModal(for: App.shared.siteListWindowController!.window!) + alert.beginSheetModal(for: App.shared.domainListWindowController!.window!) } } diff --git a/phpmon/Domain/SiteList/Cells/SiteListProxiesCell.swift b/phpmon/Domain/DomainList/Cells/DomainListProxiesCell.swift similarity index 84% rename from phpmon/Domain/SiteList/Cells/SiteListProxiesCell.swift rename to phpmon/Domain/DomainList/Cells/DomainListProxiesCell.swift index 69b5b97..33c866d 100644 --- a/phpmon/Domain/SiteList/Cells/SiteListProxiesCell.swift +++ b/phpmon/Domain/DomainList/Cells/DomainListProxiesCell.swift @@ -1,5 +1,5 @@ // -// SiteListNameCell.swift +// DomainListNameCell.swift // PHP Monitor // // Created by Nico Verbruggen on 16/03/2022. @@ -9,9 +9,9 @@ import Cocoa import AppKit -class SiteListProxiesCell: NSTableCellView, SiteListCellProtocol +class DomainListProxiesCell: NSTableCellView, DomainListCellProtocol { - static let reusableName = "siteListProxiesCell" + static let reusableName = "domainListProxiesCell" @IBOutlet weak var textFieldPrimary: NSTextField! @IBOutlet weak var textFieldAdditional: NSTextField! diff --git a/phpmon/Domain/SiteList/Cells/SiteListTLSCell.swift b/phpmon/Domain/DomainList/Cells/DomainListTLSCell.swift similarity index 77% rename from phpmon/Domain/SiteList/Cells/SiteListTLSCell.swift rename to phpmon/Domain/DomainList/Cells/DomainListTLSCell.swift index 466d165..94433b7 100644 --- a/phpmon/Domain/SiteList/Cells/SiteListTLSCell.swift +++ b/phpmon/Domain/DomainList/Cells/DomainListTLSCell.swift @@ -1,5 +1,5 @@ // -// SiteListNameCell.swift +// DomainListNameCell.swift // PHP Monitor // // Created by Nico Verbruggen on 16/03/2022. @@ -9,9 +9,9 @@ import Cocoa import AppKit -class SiteListTLSCell: NSTableCellView, SiteListCellProtocol +class DomainListTLSCell: NSTableCellView, DomainListCellProtocol { - static let reusableName = "siteListTLSCell" + static let reusableName = "domainListTLSCell" @IBOutlet weak var imageViewLock: NSImageView! diff --git a/phpmon/Domain/SiteList/Cells/SiteListTypeCell.swift b/phpmon/Domain/DomainList/Cells/DomainListTypeCell.swift similarity index 85% rename from phpmon/Domain/SiteList/Cells/SiteListTypeCell.swift rename to phpmon/Domain/DomainList/Cells/DomainListTypeCell.swift index 536d482..b670684 100644 --- a/phpmon/Domain/SiteList/Cells/SiteListTypeCell.swift +++ b/phpmon/Domain/DomainList/Cells/DomainListTypeCell.swift @@ -1,5 +1,5 @@ // -// SiteListTypeCell.swift +// DomainListTypeCell.swift // PHP Monitor // // Created by Nico Verbruggen on 16/03/2022. @@ -9,9 +9,9 @@ import Cocoa import AppKit -class SiteListTypeCell: NSTableCellView, SiteListCellProtocol +class DomainListTypeCell: NSTableCellView, DomainListCellProtocol { - static let reusableName = "siteListTypeCell" + static let reusableName = "domainListTypeCell" @IBOutlet weak var labelDriver: NSTextField! @IBOutlet weak var labelPhpVersion: NSTextField! diff --git a/phpmon/Domain/SiteList/SiteListVC+Actions.swift b/phpmon/Domain/DomainList/DomainListVC+Actions.swift similarity index 81% rename from phpmon/Domain/SiteList/SiteListVC+Actions.swift rename to phpmon/Domain/DomainList/DomainListVC+Actions.swift index 2cdf79e..268c0e3 100644 --- a/phpmon/Domain/SiteList/SiteListVC+Actions.swift +++ b/phpmon/Domain/DomainList/DomainListVC+Actions.swift @@ -1,5 +1,5 @@ // -// SiteListVC+Actions.swift +// DomainListVC+Actions.swift // PHP Monitor // // Created by Nico Verbruggen on 23/12/2021. @@ -9,7 +9,7 @@ import Foundation import Cocoa -extension SiteListVC { +extension DomainListVC { @objc func toggleSecure() { let rowToReload = tableView.selectedRow @@ -25,16 +25,16 @@ extension SiteListVC { if selectedSite.secured == originalSecureStatus { BetterAlert() .withInformation( - title: "site_list.alerts_status_not_changed.title".localized, - subtitle: "site_list.alerts_status_not_changed.desc".localized(command) + title: "domain_list.alerts_status_not_changed.title".localized, + subtitle: "domain_list.alerts_status_not_changed.desc".localized(command) ) .withPrimary(text: "OK") .show() } else { let newState = selectedSite.secured ? "secured" : "unsecured" LocalNotification.send( - title: "site_list.alerts_status_changed.title".localized, - subtitle: "site_list.alerts_status_changed.desc" + title: "domain_list.alerts_status_changed.title".localized, + subtitle: "domain_list.alerts_status_changed.desc" .localized( "\(selectedSite.name).\(Valet.shared.config.tld)", newState @@ -56,8 +56,8 @@ extension SiteListVC { } else { BetterAlert() .withInformation( - title: "site_list.alert.invalid_folder_name".localized, - subtitle: "site_list.alert.invalid_folder_name_desc".localized + title: "domain_list.alert.invalid_folder_name".localized, + subtitle: "domain_list.alert.invalid_folder_name_desc".localized ) .withPrimary(text: "OK") .show() @@ -86,9 +86,9 @@ extension SiteListVC { if self.selectedSite!.isolatedPhpVersion == nil { BetterAlert() .withInformation( - title: "site_list.alerts_isolation_failed.title".localized, - subtitle: "site_list.alerts_isolation_failed.subtitle".localized, - description: "site_list.alerts_isolation_failed.desc".localized(command) + title: "domain_list.alerts_isolation_failed.title".localized, + subtitle: "domain_list.alerts_isolation_failed.subtitle".localized, + description: "domain_list.alerts_isolation_failed.desc".localized(command) ) .withPrimary(text: "OK") .show() @@ -113,9 +113,9 @@ extension SiteListVC { Alert.confirm( onWindow: view.window!, - messageText: "site_list.confirm_unlink".localized(site.name), + messageText: "domain_list.confirm_unlink".localized(site.name), informativeText: "site_link.confirm_link".localized, - buttonTitle: "site_list.unlink".localized, + buttonTitle: "domain_list.unlink".localized, secondButtonTitle: "Cancel", style: .critical, onFirstButtonPressed: { diff --git a/phpmon/Domain/SiteList/SiteListVC+ContextMenu.swift b/phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift similarity index 79% rename from phpmon/Domain/SiteList/SiteListVC+ContextMenu.swift rename to phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift index fba11a0..fb298d2 100644 --- a/phpmon/Domain/SiteList/SiteListVC+ContextMenu.swift +++ b/phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift @@ -1,5 +1,5 @@ // -// SiteListVC+ContextMenu.swift +// DomainListVC+ContextMenu.swift // PHP Monitor // // Created by Nico Verbruggen on 10/12/2021. @@ -8,7 +8,7 @@ import Cocoa -extension SiteListVC { +extension DomainListVC { internal func reloadContextMenu() { guard let site = selectedSite else { @@ -36,19 +36,19 @@ extension SiteListVC { } private func addSystemApps(to menu: NSMenu) { - menu.addItem(withTitle: "site_list.system_apps".localized, action: nil, keyEquivalent: "") + menu.addItem(withTitle: "domain_list.system_apps".localized, action: nil, keyEquivalent: "") menu.addItem( - withTitle: "site_list.open_in_finder".localized, + withTitle: "domain_list.open_in_finder".localized, action: #selector(self.openInFinder), keyEquivalent: "F" ) menu.addItem( - withTitle: "site_list.open_in_terminal".localized, + withTitle: "domain_list.open_in_terminal".localized, action: #selector(self.openInTerminal), keyEquivalent: "T" ) menu.addItem( - withTitle: "site_list.open_in_browser".localized, + withTitle: "domain_list.open_in_browser".localized, action: #selector(self.openInBrowser), keyEquivalent: "B" ) @@ -57,7 +57,7 @@ extension SiteListVC { private func addDetectedApps(to menu: NSMenu) { if (applications.count > 0) { menu.addItem(NSMenuItem.separator()) - menu.addItem(withTitle: "site_list.detected_apps".localized, action: nil, keyEquivalent: "") + menu.addItem(withTitle: "domain_list.detected_apps".localized, action: nil, keyEquivalent: "") for (_, editor) in applications.enumerated() { let editorMenuItem = EditorMenuItem( @@ -74,7 +74,7 @@ extension SiteListVC { private func addUnlink(to menu: NSMenu, with site: ValetSite) { if (site.aliasPath != nil) { menu.addItem( - withTitle: "site_list.unlink".localized, + withTitle: "domain_list.unlink".localized, action: #selector(self.unlinkSite), keyEquivalent: "" ) @@ -83,14 +83,14 @@ extension SiteListVC { } private func addDisabledIsolation(to menu: NSMenu) { - menu.addItem(withTitle: "site_list.isolation_unavailable".localized, action: nil, keyEquivalent: "") + menu.addItem(withTitle: "domain_list.isolation_unavailable".localized, action: nil, keyEquivalent: "") menu.addItem(NSMenuItem.separator()) } private func addIsolate(to menu: NSMenu, with site: ValetSite) { if site.isolatedPhpVersion == nil { // ISOLATION POSSIBLE - let isolationMenuItem = NSMenuItem(title:"site_list.isolate".localized, action: nil, keyEquivalent: "") + let isolationMenuItem = NSMenuItem(title:"domain_list.isolate".localized, action: nil, keyEquivalent: "") let submenu = NSMenu() submenu.addItem(withTitle: "Choose a PHP version", action: nil, keyEquivalent: "") for version in PhpEnv.shared.availablePhpVersions.reversed() { @@ -105,7 +105,7 @@ extension SiteListVC { } else { // REMOVE ISOLATION POSSIBLE menu.addItem( - withTitle: "site_list.remove_isolation".localized, + withTitle: "domain_list.remove_isolation".localized, action: #selector(self.removeIsolatedSite), keyEquivalent: "" ) @@ -116,8 +116,8 @@ extension SiteListVC { private func addToggleSecure(to menu: NSMenu, with site: ValetSite) { menu.addItem( withTitle: site.secured - ? "site_list.unsecure".localized - : "site_list.secure".localized, + ? "domain_list.unsecure".localized + : "domain_list.secure".localized, action: #selector(toggleSecure), keyEquivalent: "" ) diff --git a/phpmon/Domain/SiteList/SiteListVC.swift b/phpmon/Domain/DomainList/DomainListVC.swift similarity index 85% rename from phpmon/Domain/SiteList/SiteListVC.swift rename to phpmon/Domain/DomainList/DomainListVC.swift index 6638a9c..43d9753 100644 --- a/phpmon/Domain/SiteList/SiteListVC.swift +++ b/phpmon/Domain/DomainList/DomainListVC.swift @@ -1,5 +1,5 @@ // -// SiteListVC.swift +// DomainListVC.swift // PHP Monitor // // Created by Nico Verbruggen on 30/03/2021. @@ -9,7 +9,7 @@ import Cocoa import Carbon -class SiteListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource { +class DomainListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource { // MARK: - Outlets @@ -49,28 +49,28 @@ class SiteListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource { let storyboard = NSStoryboard(name: "Main" , bundle : nil) let windowController = storyboard.instantiateController( - withIdentifier: "siteListWindow" - ) as! SiteListWC + withIdentifier: "domainListWindow" + ) as! DomainListWC - windowController.window!.title = "site_list.title".localized - windowController.window!.subtitle = "site_list.subtitle".localized + windowController.window!.title = "domain_list.title".localized + windowController.window!.subtitle = "domain_list.subtitle".localized windowController.window!.delegate = delegate windowController.window!.styleMask = [ .titled, .closable, .resizable, .miniaturizable ] windowController.window!.minSize = NSSize(width: 550, height: 200) windowController.window!.delegate = windowController - windowController.window!.setFrameAutosaveName("siteListWindow") + windowController.window!.setFrameAutosaveName("domainListWindow") - App.shared.siteListWindowController = windowController + App.shared.domainListWindowController = windowController } public static func show(delegate: NSWindowDelegate? = nil) { - if (App.shared.siteListWindowController == nil) { + if (App.shared.domainListWindowController == nil) { Self.create(delegate: delegate) } - App.shared.siteListWindowController!.showWindow(self) + App.shared.domainListWindowController!.showWindow(self) NSApp.activate(ignoringOtherApps: true) } @@ -207,19 +207,18 @@ class SiteListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource { func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? { let mapping: [String: String] = [ - "TLS": SiteListTLSCell.reusableName, - "DOMAIN": SiteListNameCell.reusableName, - "ENVIRONMENT": SiteListPhpCell.reusableName, - "KIND": SiteListKindCell.reusableName, - "TYPE": SiteListTypeCell.reusableName, - "PROXY": SiteListProxiesCell.reusableName, + "TLS": DomainListTLSCell.reusableName, + "DOMAIN": DomainListNameCell.reusableName, + "ENVIRONMENT": DomainListPhpCell.reusableName, + "KIND": DomainListKindCell.reusableName, + "TYPE": DomainListTypeCell.reusableName ] let columnName = tableColumn!.identifier.rawValue let identifier = NSUserInterfaceItemIdentifier(rawValue: mapping[columnName]!) guard let userCell = tableView.makeView(withIdentifier: identifier, owner: self) - as? SiteListCellProtocol else { return nil } + as? DomainListCellProtocol else { return nil } userCell.populateCell(with: sites[row]) @@ -240,21 +239,7 @@ class SiteListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource { // MARK: - (Search) Text Field Delegate - func toggleProxyColumnBasedOnActiveProxies() { - let id = self.tableView.column( - withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "PROXY") - ) - - let column = self.tableView.tableColumns[id] - - column.isHidden = !sites.contains(where: { site in - site.proxies.count > 0 - }) - } - func reloadTable() { - toggleProxyColumnBasedOnActiveProxies() - if let sortDescriptor = sortDescriptor { self.applySortDescriptor(sortDescriptor) } @@ -293,6 +278,6 @@ class SiteListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource { // MARK: - Deinitialization deinit { - Log.perf("SiteListVC deallocated") + Log.perf("DomainListVC deallocated") } } diff --git a/phpmon/Domain/SiteList/SiteListWC.swift b/phpmon/Domain/DomainList/DomainListWC.swift similarity index 89% rename from phpmon/Domain/SiteList/SiteListWC.swift rename to phpmon/Domain/DomainList/DomainListWC.swift index 4d85cac..cdcdb3a 100644 --- a/phpmon/Domain/SiteList/SiteListWC.swift +++ b/phpmon/Domain/DomainList/DomainListWC.swift @@ -1,5 +1,5 @@ // -// SiteListWC.swift +// DomainListWC.swift // PHP Monitor // // Created by Nico Verbruggen on 03/12/2021. @@ -8,12 +8,12 @@ import Cocoa -class SiteListWC: PMWindowController, NSSearchFieldDelegate, NSToolbarDelegate { +class DomainListWC: PMWindowController, NSSearchFieldDelegate, NSToolbarDelegate { // MARK: - Window Identifier override var windowName: String { - return "SiteList" + return "DomainList" } // MARK: - Outlets @@ -30,8 +30,8 @@ class SiteListWC: PMWindowController, NSSearchFieldDelegate, NSToolbarDelegate { // MARK: - Search functionality - var contentVC: SiteListVC { - return self.contentViewController as! SiteListVC + var contentVC: DomainListVC { + return self.contentViewController as! DomainListVC } var searchTimer: Timer? @@ -62,7 +62,7 @@ class SiteListWC: PMWindowController, NSSearchFieldDelegate, NSToolbarDelegate { func selectFolder() { let dialog = NSOpenPanel() - dialog.message = "site_list.add.modal_description".localized + dialog.message = "domain_list.add.modal_description".localized dialog.showsResizeIndicator = true dialog.showsHiddenFiles = false dialog.allowsMultipleSelection = false diff --git a/phpmon/Domain/Menu/MainMenu+Switcher.swift b/phpmon/Domain/Menu/MainMenu+Switcher.swift index 1bf33d0..75744f1 100644 --- a/phpmon/Domain/Menu/MainMenu+Switcher.swift +++ b/phpmon/Domain/Menu/MainMenu+Switcher.swift @@ -25,7 +25,7 @@ extension MainMenu { PhpEnv.shared.isBusy = false // Reload the site list - self.reloadSiteListData() + self.reloadDomainListData() // Perform UI updates on main thread DispatchQueue.main.async { [self] in @@ -70,8 +70,8 @@ extension MainMenu { } } - private func reloadSiteListData() { - if let window = App.shared.siteListWindowController { + private func reloadDomainListData() { + if let window = App.shared.domainListWindowController { DispatchQueue.main.async { window.contentVC.reloadSites() } diff --git a/phpmon/Domain/Menu/MainMenu.swift b/phpmon/Domain/Menu/MainMenu.swift index 29e20de..80d6fac 100644 --- a/phpmon/Domain/Menu/MainMenu.swift +++ b/phpmon/Domain/Menu/MainMenu.swift @@ -323,8 +323,8 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate, PhpSwitcherDelegate PrefsVC.show() } - @objc func openSiteList() { - SiteListVC.show() + @objc func openDomainList() { + DomainListVC.show() } @objc func openDonate() { diff --git a/phpmon/Domain/Menu/StatusMenu.swift b/phpmon/Domain/Menu/StatusMenu.swift index f234ba9..7f18544 100644 --- a/phpmon/Domain/Menu/StatusMenu.swift +++ b/phpmon/Domain/Menu/StatusMenu.swift @@ -41,7 +41,7 @@ class StatusMenu : NSMenu { func addValetMenuItems() { self.addItem(HeaderView.asMenuItem(text: "mi_valet".localized)) self.addItem(NSMenuItem(title: "mi_valet_config".localized, action: #selector(MainMenu.openValetConfigFolder), keyEquivalent: "v")) - self.addItem(NSMenuItem(title: "mi_sitelist".localized, action: #selector(MainMenu.openSiteList), keyEquivalent: "l")) + self.addItem(NSMenuItem(title: "mi_domain_list".localized, action: #selector(MainMenu.openDomainList), keyEquivalent: "l")) self.addItem(NSMenuItem.separator()) } diff --git a/phpmon/Localizable.strings b/phpmon/Localizable.strings index 75f36ee..7296f74 100644 --- a/phpmon/Localizable.strings +++ b/phpmon/Localizable.strings @@ -53,7 +53,7 @@ "mi_no_extensions_detected" = "No additional extensions detected."; "mi_valet" = "Laravel Valet"; -"mi_sitelist" = "View Linked and Parked Domains..."; +"mi_domain_list" = "View Linked and Parked Domains..."; "mi_preferences" = "Preferences..."; "mi_donate" = "Donate..."; @@ -63,25 +63,25 @@ // 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"; +"mm_reload_domain_list" = "Reload Site List"; +"mm_find_in_domain_list" = "Search in Site List"; // SITE LIST -"site_list.title" = "Domains"; -"site_list.subtitle" = "Linked & Parked"; +"domain_list.title" = "Domains"; +"domain_list.subtitle" = "Linked & Parked"; -"site_list.alerts_isolation_failed.title" = "Oops! Site Not Isolated"; -"site_list.alerts_isolation_failed.subtitle" = "Something went wrong trying to isolate this site. If this is your default site but it is not linked, I recommend manually linking the site prior to setting up isolation."; -"site_list.alerts_isolation_failed.desc" = "To find out what goes wrong, you can try running the command in your terminal manually: %@"; +"domain_list.alerts_isolation_failed.title" = "Oops! Site Not Isolated"; +"domain_list.alerts_isolation_failed.subtitle" = "Something went wrong trying to isolate this site. If this is your default site but it is not linked, I recommend manually linking the site prior to setting up isolation."; +"domain_list.alerts_isolation_failed.desc" = "To find out what goes wrong, you can try running the command in your terminal manually: %@"; -"site_list.alerts_status_not_changed.title" = "Oops! SSL Status Not Changed"; -"site_list.alerts_status_not_changed.desc" = "Something went wrong. Try running the command in your terminal manually: %@"; +"domain_list.alerts_status_not_changed.title" = "Oops! SSL Status Not Changed"; +"domain_list.alerts_status_not_changed.desc" = "Something went wrong. Try running the command in your terminal manually: %@"; -"site_list.alerts_status_changed.title" = "SSL Status Changed"; -"site_list.alerts_status_changed.desc" = "The domain '%@' is now %@."; +"domain_list.alerts_status_changed.title" = "SSL Status Changed"; +"domain_list.alerts_status_changed.desc" = "The domain '%@' is now %@."; -"site_list.confirm_unlink" = "Are you sure you want to unlink '%@'?"; +"domain_list.confirm_unlink" = "Are you sure you want to unlink '%@'?"; "site_link.confirm_link" = "No files will be removed. You can always link the folder again by clicking on the + button and selecting the original folder."; "site_link.close" = "Close"; @@ -89,51 +89,51 @@ // ADD SITE TO SITE LIST -"site_list.add.link_folder" = "Link a Folder"; -"site_list.add.domain_name_placeholder" = "Enter a domain name here"; -"site_list.add.secure_after_creation" = "Secure %@.%@ after creation"; -"site_list.add.secure_description" = "Securing a site requires administrative privileges.\nYou will be prompted for your password or Touch ID."; -"site_list.add.create_link" = "Create Link"; -"site_list.add.cancel" = "Cancel"; -"site_list.add.folder_available" = "This site will be available via the following URL: %@://%@.%@"; +"domain_list.add.link_folder" = "Link a Folder"; +"domain_list.add.domain_name_placeholder" = "Enter a domain name here"; +"domain_list.add.secure_after_creation" = "Secure %@.%@ after creation"; +"domain_list.add.secure_description" = "Securing a site requires administrative privileges.\nYou will be prompted for your password or Touch ID."; +"domain_list.add.create_link" = "Create Link"; +"domain_list.add.cancel" = "Cancel"; +"domain_list.add.folder_available" = "This site will be available via the following URL: %@://%@.%@"; -"site_list.add.errors.empty" = "You must enter a name."; -"site_list.add.errors.already_exists" = "A link with that name already exists."; +"domain_list.add.errors.empty" = "You must enter a name."; +"domain_list.add.errors.already_exists" = "A link with that name already exists."; // ADD SITE ERROR: FOLDER MISSING SINCE SELECTION -"site_list.alert.folder_missing.desc" = "The folder you chose no longer seems to exist. Do you want to cancel adding this folder? If you moved the folder, you could always put it back and try again."; -"site_list.alert.folder_missing.title" = "Folder missing!"; -"site_list.alert.folder_missing.cancel" = "Cancel Link"; -"site_list.alert.folder_missing.return" = "OK"; +"domain_list.alert.folder_missing.desc" = "The folder you chose no longer seems to exist. Do you want to cancel adding this folder? If you moved the folder, you could always put it back and try again."; +"domain_list.alert.folder_missing.title" = "Folder missing!"; +"domain_list.alert.folder_missing.cancel" = "Cancel Link"; +"domain_list.alert.folder_missing.return" = "OK"; -"site_list.add.modal_description" = "First, select which folder you would like to link."; +"domain_list.add.modal_description" = "First, select which folder you would like to link."; // SITE LIST ACTIONS -"site_list.isolate" = "Isolate Domain"; -"site_list.remove_isolation" = "Remove Isolation"; -"site_list.isolation_unavailable" = "Isolation Not Supported (in Valet 2)"; +"domain_list.isolate" = "Isolate Domain"; +"domain_list.remove_isolation" = "Remove Isolation"; +"domain_list.isolation_unavailable" = "Isolation Not Supported (in Valet 2)"; -"site_list.unlink" = "Unlink Directory"; -"site_list.secure" = "Secure Domain"; -"site_list.unsecure" = "Unsecure Domain"; -"site_list.open_in_finder" = "Open in Finder"; -"site_list.open_in_browser" = "Open in Browser"; -"site_list.open_in_terminal" = "Open in Terminal"; -"site_list.detected_apps" = "Detected Applications"; -"site_list.system_apps" = "System Applications"; +"domain_list.unlink" = "Unlink Directory"; +"domain_list.secure" = "Secure Domain"; +"domain_list.unsecure" = "Unsecure Domain"; +"domain_list.open_in_finder" = "Open in Finder"; +"domain_list.open_in_browser" = "Open in Browser"; +"domain_list.open_in_terminal" = "Open in Terminal"; +"domain_list.detected_apps" = "Detected Applications"; +"domain_list.system_apps" = "System Applications"; -"site_list.warning.spaces" = "Warning! This site has a space in its folder.\nThe site will not be reachable via the browser."; +"domain_list.warning.spaces" = "Warning! This site has a space in its folder.\nThe site will not be reachable via the browser."; -"site_list.alert.invalid_folder_name" = "Invalid folder name"; -"site_list.alert.invalid_folder_name_desc" = "This folder could not be resolved to a valid URL. This is usually because there’s a space in the folder name. Please rename the folder, reload the list of sites, and try again."; +"domain_list.alert.invalid_folder_name" = "Invalid folder name"; +"domain_list.alert.invalid_folder_name_desc" = "This folder could not be resolved to a valid URL. This is usually because there’s a space in the folder name. Please rename the folder, reload the list of sites, and try again."; -"site_list.columns.tls" = "TLS"; -"site_list.columns.domain" = "Domain"; -"site_list.columns.php" = "PHP"; -"site_list.columns.type" = "Type"; -"site_list.columns.kind" = "Kind"; +"domain_list.columns.tls" = "TLS"; +"domain_list.columns.domain" = "Domain"; +"domain_list.columns.php" = "PHP"; +"domain_list.columns.type" = "Type"; +"domain_list.columns.kind" = "Kind"; // DRIVERS