diff --git a/Passepartout/App/macOS/Base.lproj/Service.storyboard b/Passepartout/App/macOS/Base.lproj/Service.storyboard
index f735d579..c2b6b45e 100644
--- a/Passepartout/App/macOS/Base.lproj/Service.storyboard
+++ b/Passepartout/App/macOS/Base.lproj/Service.storyboard
@@ -846,10 +846,10 @@ DQ
-
+
-
+
@@ -869,13 +869,13 @@ DQ
-
+
-
+
-
+
@@ -883,7 +883,7 @@ DQ
-
+
@@ -897,7 +897,7 @@ DQ
-
+
@@ -922,6 +922,38 @@ DQ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -946,14 +978,18 @@ DQ
+
+
+
+
@@ -980,8 +1016,10 @@ DQ
+
+
@@ -1358,7 +1396,7 @@ DQ
-
+
diff --git a/Passepartout/App/macOS/CHANGELOG.md b/Passepartout/App/macOS/CHANGELOG.md
index 5d6fa6a9..f203be62 100644
--- a/Passepartout/App/macOS/CHANGELOG.md
+++ b/Passepartout/App/macOS/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-## 1.15.0 Beta 2528 (2021-01-26)
+## Unreleased
### Added
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Provider infrastructure selectors not reloaded on profile change.
+- Missing PAC URL in proxy settings on macOS.
## 1.0.0 (2021-01-01)
diff --git a/Passepartout/App/macOS/Scenes/Service/Customization/ProxyViewController.swift b/Passepartout/App/macOS/Scenes/Service/Customization/ProxyViewController.swift
index ca44d804..c7bc7290 100644
--- a/Passepartout/App/macOS/Scenes/Service/Customization/ProxyViewController.swift
+++ b/Passepartout/App/macOS/Scenes/Service/Customization/ProxyViewController.swift
@@ -41,6 +41,10 @@ class ProxyViewController: NSViewController, ProfileCustomization {
@IBOutlet private weak var textProxyPort: NSTextField!
+ @IBOutlet private weak var labelPACCaption: NSTextField!
+
+ @IBOutlet private weak var textPAC: NSTextField!
+
@IBOutlet private weak var viewProxyBypass: NSView!
@IBOutlet private var constraintChoiceBottom: NSLayoutConstraint!
@@ -69,6 +73,8 @@ class ProxyViewController: NSViewController, ProfileCustomization {
labelProxyCaption.stringValue = L10n.Core.Global.Captions.address.asCaption
textProxyAddress.placeholderString = L10n.Core.Global.Values.none
textProxyPort.placeholderString = L10n.Core.Global.Values.none
+ labelPACCaption.stringValue = "PAC".asCaption
+ textPAC.placeholderString = L10n.Core.Global.Values.none
tableProxyBypass.title = L10n.App.NetworkSettings.Proxy.Cells.BypassDomains.title.asCaption
viewProxyBypass.addSubview(tableProxyBypass)
@@ -108,6 +114,7 @@ class ProxyViewController: NSViewController, ProfileCustomization {
view.endEditing()
networkSettings.proxyAddress = textProxyAddress.stringValue
networkSettings.proxyPort = UInt16(textProxyPort.stringValue)
+ networkSettings.proxyAutoConfigurationURL = URL(string: textPAC.stringValue)
networkSettings.proxyBypassDomains = tableProxyBypass.rows
delegate?.profileCustomization(self, didUpdateProxy: .manual, withManualSettings: networkSettings)
@@ -136,6 +143,7 @@ class ProxyViewController: NSViewController, ProfileCustomization {
textProxyAddress.stringValue = networkSettings.proxyAddress ?? ""
textProxyPort.isEnabled = (currentChoice == .manual)
textProxyPort.stringValue = networkSettings.proxyPort?.description ?? ""
+ textPAC.stringValue = networkSettings.proxyAutoConfigurationURL?.absoluteString ?? ""
tableProxyBypass.reset(withRows: networkSettings.proxyBypassDomains ?? [], isAddEnabled: currentChoice == .manual)
let isServer = (currentChoice == .server)