passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Embed proxy settings in stack view

This commit is contained in:
Davide De Rosa 2021-01-26 19:43:30 +01:00
parent 08587db7fa
commit 53234aad19
3 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Passepartout/App/macOS/Base.lproj/Service.storyboard
View File

@ -841,7 +841,7 @@ DQ
<scene sceneID="lCI-lq-aRn"> <scene sceneID="lCI-lq-aRn">
<objects> <objects>
<viewController title="PROXY" id="GKB-5a-YDj" userLabel="PROXY" customClass="ProxyViewController" customModule="Passepartout" customModuleProvider="target" sceneMemberID="viewController"> <viewController title="PROXY" id="GKB-5a-YDj" userLabel="PROXY" customClass="ProxyViewController" customModule="Passepartout" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="0vU-UL-a3L"> <view key="view" misplaced="YES" id="0vU-UL-a3L">
<rect key="frame" x="0.0" y="0.0" width="520" height="261"/> <rect key="frame" x="0.0" y="0.0" width="520" height="261"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
@ -868,14 +868,14 @@ DQ
<action selector="pickChoice:" target="GKB-5a-YDj" id="Vgj-M1-c40"/> <action selector="pickChoice:" target="GKB-5a-YDj" id="Vgj-M1-c40"/>
</connections> </connections>
</popUpButton> </popUpButton>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="lIW-gM-F4p"> <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3mV-87-Odw">
<rect key="frame" x="0.0" y="0.0" width="500" height="191"/> <rect key="frame" x="0.0" y="0.0" width="500" height="191"/>
<subviews> <subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="tWj-MW-BEZ"> <customView translatesAutoresizingMaskIntoConstraints="NO" id="tWj-MW-BEZ">
<rect key="frame" x="0.0" y="170" width="500" height="21"/> <rect key="frame" x="0.0" y="168" width="500" height="23"/>
<subviews> <subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1lz-QY-I4a"> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1lz-QY-I4a">
<rect key="frame" x="-2" y="3" width="144" height="16"/> <rect key="frame" x="-2" y="4" width="144" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="ADDR" id="YDY-1u-h1f"> <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="ADDR" id="YDY-1u-h1f">
<font key="font" usesAppearanceFont="YES"/> <font key="font" usesAppearanceFont="YES"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@ -883,7 +883,7 @@ DQ
</textFieldCell> </textFieldCell>
</textField> </textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="agk-kA-yKN"> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="agk-kA-yKN">
<rect key="frame" x="150" y="0.0" width="130" height="21"/> <rect key="frame" x="150" y="0.0" width="130" height="23"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="130" id="7Ec-rg-RBm"/> <constraint firstAttribute="width" constant="130" id="7Ec-rg-RBm"/>
</constraints> </constraints>
@ -897,7 +897,7 @@ DQ
</connections> </connections>
</textField> </textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aOI-Xp-liP"> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aOI-Xp-liP">
<rect key="frame" x="280" y="0.0" width="60" height="21"/> <rect key="frame" x="280" y="1" width="60" height="21"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="60" id="cCA-F4-gRF"/> <constraint firstAttribute="width" constant="60" id="cCA-F4-gRF"/>
</constraints> </constraints>
@ -920,9 +920,11 @@ DQ
<constraint firstItem="1lz-QY-I4a" firstAttribute="centerY" secondItem="agk-kA-yKN" secondAttribute="centerY" id="k54-yc-nlu"/> <constraint firstItem="1lz-QY-I4a" firstAttribute="centerY" secondItem="agk-kA-yKN" secondAttribute="centerY" id="k54-yc-nlu"/>
<constraint firstAttribute="bottom" secondItem="agk-kA-yKN" secondAttribute="bottom" id="snC-1Z-lN8"/> <constraint firstAttribute="bottom" secondItem="agk-kA-yKN" secondAttribute="bottom" id="snC-1Z-lN8"/>
<constraint firstItem="agk-kA-yKN" firstAttribute="leading" secondItem="1lz-QY-I4a" secondAttribute="trailing" constant="10" id="wtb-VQ-9g1"/> <constraint firstItem="agk-kA-yKN" firstAttribute="leading" secondItem="1lz-QY-I4a" secondAttribute="trailing" constant="10" id="wtb-VQ-9g1"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="agk-kA-yKN" secondAttribute="trailing" id="x8u-Nw-hny"/>
</constraints> </constraints>
</customView> </customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="lIW-gM-F4p">
<rect key="frame" x="0.0" y="0.0" width="500" height="160"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="OXH-cq-bhS"> <customView translatesAutoresizingMaskIntoConstraints="NO" id="OXH-cq-bhS">
<rect key="frame" x="150" y="0.0" width="350" height="160"/> <rect key="frame" x="150" y="0.0" width="350" height="160"/>
<constraints> <constraints>
@ -932,24 +934,38 @@ DQ
</subviews> </subviews>
<constraints> <constraints>
<constraint firstAttribute="bottom" secondItem="OXH-cq-bhS" secondAttribute="bottom" id="7z0-Rw-lxr"/> <constraint firstAttribute="bottom" secondItem="OXH-cq-bhS" secondAttribute="bottom" id="7z0-Rw-lxr"/>
<constraint firstItem="OXH-cq-bhS" firstAttribute="top" secondItem="tWj-MW-BEZ" secondAttribute="bottom" constant="10" id="J4Q-c9-QoL"/>
<constraint firstItem="OXH-cq-bhS" firstAttribute="leading" secondItem="agk-kA-yKN" secondAttribute="leading" id="JY4-Ul-M5P"/>
<constraint firstAttribute="trailing" secondItem="OXH-cq-bhS" secondAttribute="trailing" id="JjH-ll-cjt"/> <constraint firstAttribute="trailing" secondItem="OXH-cq-bhS" secondAttribute="trailing" id="JjH-ll-cjt"/>
<constraint firstAttribute="trailing" secondItem="tWj-MW-BEZ" secondAttribute="trailing" id="KRJ-dI-RyW"/> <constraint firstItem="OXH-cq-bhS" firstAttribute="top" secondItem="lIW-gM-F4p" secondAttribute="top" id="dlE-3Z-t5f"/>
<constraint firstItem="tWj-MW-BEZ" firstAttribute="leading" secondItem="lIW-gM-F4p" secondAttribute="leading" id="Unc-PG-Sxh"/>
<constraint firstItem="tWj-MW-BEZ" firstAttribute="top" secondItem="lIW-gM-F4p" secondAttribute="top" id="bQO-0M-yYX"/>
</constraints> </constraints>
</customView> </customView>
</subviews> </subviews>
<constraints> <constraints>
<constraint firstAttribute="bottom" secondItem="lIW-gM-F4p" secondAttribute="bottom" id="6jE-yl-iES"/> <constraint firstAttribute="trailing" secondItem="tWj-MW-BEZ" secondAttribute="trailing" id="8hm-OP-AMJ"/>
<constraint firstItem="OXH-cq-bhS" firstAttribute="leading" secondItem="agk-kA-yKN" secondAttribute="leading" id="9d2-sd-Aau"/>
<constraint firstItem="tWj-MW-BEZ" firstAttribute="leading" secondItem="3mV-87-Odw" secondAttribute="leading" id="L62-SQ-ngq"/>
<constraint firstItem="tWj-MW-BEZ" firstAttribute="top" secondItem="3mV-87-Odw" secondAttribute="top" id="MsT-lY-mAK"/>
<constraint firstAttribute="bottom" secondItem="lIW-gM-F4p" secondAttribute="bottom" id="OxC-ah-XcI"/>
<constraint firstAttribute="trailing" secondItem="lIW-gM-F4p" secondAttribute="trailing" id="d9m-id-d4S"/>
</constraints>
<visibilityPriorities>
<integer value="1000"/>
<integer value="1000"/>
</visibilityPriorities>
<customSpacing>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
</subviews>
<constraints>
<constraint firstItem="Vnw-dm-nrd" firstAttribute="top" secondItem="qqg-dj-Man" secondAttribute="top" id="9gA-AG-lMS"/> <constraint firstItem="Vnw-dm-nrd" firstAttribute="top" secondItem="qqg-dj-Man" secondAttribute="top" id="9gA-AG-lMS"/>
<constraint firstItem="lIW-gM-F4p" firstAttribute="leading" secondItem="qqg-dj-Man" secondAttribute="leading" id="B5V-Mj-U8A"/> <constraint firstItem="3mV-87-Odw" firstAttribute="leading" secondItem="qqg-dj-Man" secondAttribute="leading" id="9oC-Oo-SMw"/>
<constraint firstItem="agk-kA-yKN" firstAttribute="leading" secondItem="Vnw-dm-nrd" secondAttribute="leading" id="IDZ-qL-1eM"/> <constraint firstAttribute="trailing" secondItem="3mV-87-Odw" secondAttribute="trailing" id="QiD-bT-7n4"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Vnw-dm-nrd" secondAttribute="trailing" id="Rrd-DL-xT3"/> <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Vnw-dm-nrd" secondAttribute="trailing" id="Rrd-DL-xT3"/>
<constraint firstAttribute="bottom" secondItem="Vnw-dm-nrd" secondAttribute="bottom" priority="250" id="ZkX-Fo-kl8"/> <constraint firstAttribute="bottom" secondItem="Vnw-dm-nrd" secondAttribute="bottom" priority="250" id="ZkX-Fo-kl8"/>
<constraint firstItem="lIW-gM-F4p" firstAttribute="top" secondItem="Vnw-dm-nrd" secondAttribute="bottom" constant="10" id="kSK-j0-Eig"/> <constraint firstAttribute="bottom" secondItem="3mV-87-Odw" secondAttribute="bottom" id="cMu-Jm-Zl1"/>
<constraint firstAttribute="trailing" secondItem="lIW-gM-F4p" secondAttribute="trailing" id="o4b-oC-rju"/> <constraint firstItem="agk-kA-yKN" firstAttribute="leading" secondItem="Vnw-dm-nrd" secondAttribute="leading" id="iLZ-6E-078"/>
<constraint firstItem="3mV-87-Odw" firstAttribute="top" secondItem="Vnw-dm-nrd" secondAttribute="bottom" constant="10" id="poK-LR-Sgw"/>
<constraint firstItem="Vnw-dm-nrd" firstAttribute="leading" secondItem="qqg-dj-Man" secondAttribute="leading" constant="150" id="uEZ-ho-gyn"/> <constraint firstItem="Vnw-dm-nrd" firstAttribute="leading" secondItem="qqg-dj-Man" secondAttribute="leading" constant="150" id="uEZ-ho-gyn"/>
</constraints> </constraints>
</customView> </customView>
@ -963,18 +979,18 @@ DQ
</view> </view>
<connections> <connections>
<outlet property="constraintChoiceBottom" destination="ZkX-Fo-kl8" id="KC2-KB-4oq"/> <outlet property="constraintChoiceBottom" destination="ZkX-Fo-kl8" id="KC2-KB-4oq"/>
<outlet property="constraintSettingsTop" destination="kSK-j0-Eig" id="2qY-Yy-08k"/> <outlet property="constraintSettingsTop" destination="poK-LR-Sgw" id="CUq-FG-BkY"/>
<outlet property="labelProxyCaption" destination="1lz-QY-I4a" id="oO6-ZW-JNA"/> <outlet property="labelProxyCaption" destination="1lz-QY-I4a" id="oO6-ZW-JNA"/>
<outlet property="popupChoice" destination="Vnw-dm-nrd" id="JGo-RJ-2Ai"/> <outlet property="popupChoice" destination="Vnw-dm-nrd" id="JGo-RJ-2Ai"/>
<outlet property="textProxyAddress" destination="agk-kA-yKN" id="2WJ-8v-kCy"/> <outlet property="textProxyAddress" destination="agk-kA-yKN" id="2WJ-8v-kCy"/>
<outlet property="textProxyPort" destination="aOI-Xp-liP" id="5Wx-Ux-Fk2"/> <outlet property="textProxyPort" destination="aOI-Xp-liP" id="5Wx-Ux-Fk2"/>
<outlet property="viewProxyBypass" destination="OXH-cq-bhS" id="m81-Wt-AtR"/> <outlet property="viewProxyBypass" destination="OXH-cq-bhS" id="m81-Wt-AtR"/>
<outlet property="viewSettings" destination="lIW-gM-F4p" id="PRX-JR-Qs8"/> <outlet property="viewSettings" destination="3mV-87-Odw" id="p8F-UI-RYg"/>
</connections> </connections>
</viewController> </viewController>
<customObject id="0pY-9A-x7h" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/> <customObject id="0pY-9A-x7h" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="219" y="1883"/> <point key="canvasLocation" x="219" y="1947"/>
</scene> </scene>
<!--GW--> <!--GW-->
<scene sceneID="kq7-Ug-Ed9"> <scene sceneID="kq7-Ug-Ed9">
@ -1342,15 +1358,15 @@ DQ
<scene sceneID="rnS-Xr-j1E"> <scene sceneID="rnS-Xr-j1E">
<objects> <objects>
<viewController title="MTU" id="0rP-u0-K0y" customClass="MTUViewController" customModule="Passepartout" customModuleProvider="target" sceneMemberID="viewController"> <viewController title="MTU" id="0rP-u0-K0y" customClass="MTUViewController" customModule="Passepartout" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="fcz-Gl-uf2"> <view key="view" misplaced="YES" id="fcz-Gl-uf2">
<rect key="frame" x="0.0" y="0.0" width="450" height="88"/> <rect key="frame" x="0.0" y="0.0" width="450" height="90"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Oze-WK-Ypf"> <customView translatesAutoresizingMaskIntoConstraints="NO" id="Oze-WK-Ypf">
<rect key="frame" x="0.0" y="20" width="450" height="48"/> <rect key="frame" x="0.0" y="20" width="450" height="50"/>
<subviews> <subviews>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="igx-z2-4Gy"> <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="igx-z2-4Gy">
<rect key="frame" x="147" y="24" width="247" height="25"/> <rect key="frame" x="147" y="26" width="247" height="25"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="240" id="6og-t3-Efq"/> <constraint firstAttribute="width" constant="240" id="6og-t3-Efq"/>
</constraints> </constraints>
@ -1413,7 +1429,7 @@ DQ
<constraints> <constraints>
<constraint firstItem="RMv-8f-kkb" firstAttribute="trailing" secondItem="igx-z2-4Gy" secondAttribute="trailing" id="A61-71-dhv"/> <constraint firstItem="RMv-8f-kkb" firstAttribute="trailing" secondItem="igx-z2-4Gy" secondAttribute="trailing" id="A61-71-dhv"/>
<constraint firstAttribute="bottom" secondItem="igx-z2-4Gy" secondAttribute="bottom" priority="250" id="Fdn-qt-eAb"/> <constraint firstAttribute="bottom" secondItem="igx-z2-4Gy" secondAttribute="bottom" priority="250" id="Fdn-qt-eAb"/>
<constraint firstItem="RMv-8f-kkb" firstAttribute="top" secondItem="igx-z2-4Gy" secondAttribute="bottom" constant="8" symbolic="YES" id="dHc-tO-9Md"/> <constraint firstItem="RMv-8f-kkb" firstAttribute="top" secondItem="igx-z2-4Gy" secondAttribute="bottom" constant="10" id="dHc-tO-9Md"/>
<constraint firstItem="RMv-8f-kkb" firstAttribute="leading" secondItem="Oze-WK-Ypf" secondAttribute="leading" id="fMe-d1-8TX"/> <constraint firstItem="RMv-8f-kkb" firstAttribute="leading" secondItem="Oze-WK-Ypf" secondAttribute="leading" id="fMe-d1-8TX"/>
<constraint firstItem="igx-z2-4Gy" firstAttribute="top" secondItem="Oze-WK-Ypf" secondAttribute="top" id="g6D-WW-lKQ"/> <constraint firstItem="igx-z2-4Gy" firstAttribute="top" secondItem="Oze-WK-Ypf" secondAttribute="top" id="g6D-WW-lKQ"/>
<constraint firstItem="igx-z2-4Gy" firstAttribute="leading" secondItem="Oze-WK-Ypf" secondAttribute="leading" constant="150" id="kHB-Oo-a7J"/> <constraint firstItem="igx-z2-4Gy" firstAttribute="leading" secondItem="Oze-WK-Ypf" secondAttribute="leading" constant="150" id="kHB-Oo-a7J"/>

2
Passepartout/App/macOS/Scenes/Service/Customization/DNSViewController.swift
View File

@ -30,7 +30,7 @@ import TunnelKit
class DNSViewController: NSViewController, ProfileCustomization { class DNSViewController: NSViewController, ProfileCustomization {
@IBOutlet private weak var popupChoice: NSPopUpButton! @IBOutlet private weak var popupChoice: NSPopUpButton!
@IBOutlet private weak var viewSettings: NSView! @IBOutlet private weak var viewSettings: NSStackView!
@IBOutlet private weak var textDNSCustom: NSTextField! @IBOutlet private weak var textDNSCustom: NSTextField!

2
Passepartout/App/macOS/Scenes/Service/Customization/ProxyViewController.swift
View File

@ -33,7 +33,7 @@ class ProxyViewController: NSViewController, ProfileCustomization {
@IBOutlet private weak var popupChoice: NSPopUpButton! @IBOutlet private weak var popupChoice: NSPopUpButton!
@IBOutlet private weak var viewSettings: NSView! @IBOutlet private weak var viewSettings: NSStackView!
@IBOutlet private weak var labelProxyCaption: NSTextField! @IBOutlet private weak var labelProxyCaption: NSTextField!