diff --git a/ui/Base.lproj/AccGeneral.xib b/ui/Base.lproj/AccGeneral.xib
index df60922033f1f1eca5f499615eafc4d5585d81c7..f784799173d50551309634697ed3aaf30f1bbb94 100644
--- a/ui/Base.lproj/AccGeneral.xib
+++ b/ui/Base.lproj/AccGeneral.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccGeneralVC">
@@ -25,7 +25,7 @@
<rect key="frame" x="0.0" y="0.0" width="582" height="380"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0Ej-Lr-p20">
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0Ej-Lr-p20">
<rect key="frame" x="171" y="214" width="150" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="6wZ-M4-Cnf">
<font key="font" metaFont="system"/>
@@ -36,7 +36,7 @@
<outlet property="delegate" destination="-2" id="4Ow-lh-114"/>
</connections>
</textField>
- <secureTextField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="POs-9R-DUW">
+ <secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="POs-9R-DUW">
<rect key="frame" x="171" y="174" width="150" height="22"/>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="Cvf-pZ-qe0">
<font key="font" metaFont="system"/>
@@ -50,7 +50,7 @@
<outlet property="delegate" destination="-2" id="SIP-Dy-rFh"/>
</connections>
</secureTextField>
- <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VuA-jX-Kqu">
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VuA-jX-Kqu">
<rect key="frame" x="171" y="254" width="150" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="37d-ck-pa7">
<font key="font" metaFont="system"/>
@@ -61,31 +61,40 @@
<outlet property="delegate" destination="-2" id="t13-Ex-wlP"/>
</connections>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3ZB-JI-U6Y">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3ZB-JI-U6Y">
<rect key="frame" x="103" y="179" width="62" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="58" id="yrv-IL-rAt"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password:" id="WCR-30-BX0">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Btb-K1-phc">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Btb-K1-phc">
<rect key="frame" x="56" y="257" width="109" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="105" id="aTC-B6-gvC"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Server hostname" id="3uy-g0-eCm">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1IP-mF-EDC">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1IP-mF-EDC">
<rect key="frame" x="18" y="282" width="81" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="77" id="5XB-yo-8jX"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Parameters" id="mlN-YG-fLS">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Otd-nX-zTh">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="Otd-nX-zTh">
<rect key="frame" x="327" y="176" width="129" height="18"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="125" id="9X5-dC-041"/>
@@ -98,7 +107,7 @@
<action selector="showPassword:" target="-2" id="TBj-zE-GcK"/>
</connections>
</button>
- <button verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="x2R-Ot-MbT">
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="x2R-Ot-MbT">
<rect key="frame" x="323" y="208" width="137" height="32"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="125" id="YzV-yr-h9S"/>
@@ -111,24 +120,33 @@
<action selector="tryRegistration:" target="-2" id="wfY-tY-fc7"/>
</connections>
</button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7fA-3M-fa5">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7fA-3M-fa5">
<rect key="frame" x="98" y="217" width="67" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="63" id="dSc-Pa-3a2"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Username" id="4Nm-hw-379">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h5v-jy-4zX">
- <rect key="frame" x="18" y="343" width="56" height="17"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h5v-jy-4zX">
+ <rect key="frame" x="18" y="343" width="305" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="52" id="rNb-Ec-Ks4"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Account" id="upU-sL-9i3">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ilk-QS-8PT">
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ilk-QS-8PT">
<rect key="frame" x="171" y="315" width="150" height="22"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="150" id="3oo-Zi-5Xa"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="E5h-w4-Vl2">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -138,15 +156,18 @@
<outlet property="delegate" destination="-2" id="P6p-ZD-ZVC"/>
</connections>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7wz-eU-lJh">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7wz-eU-lJh">
<rect key="frame" x="131" y="318" width="34" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="30" id="TpO-qZ-6AX"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Alias" id="Mxv-Rt-ON6">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T5L-Hx-tAq">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="T5L-Hx-tAq">
<rect key="frame" x="30" y="110" width="426" height="18"/>
<buttonCell key="cell" type="check" title="Auto-answer calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="YMy-QE-7A3">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -156,7 +177,7 @@
<action selector="toggleAutoAnswer:" target="-2" id="is7-Vh-7Hf"/>
</connections>
</button>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="a4o-bf-KQu">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="a4o-bf-KQu">
<rect key="frame" x="30" y="79" width="168" height="18"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="164" id="jr6-fZ-YC7"/>
@@ -169,8 +190,11 @@
<action selector="toggleCustomAgent:" target="-2" id="kY4-pJ-Wic"/>
</connections>
</button>
- <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="y8K-Hi-TMC">
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y8K-Hi-TMC">
<rect key="frame" x="204" y="77" width="131" height="22"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="131" id="qbk-dr-u8z"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="cv3-cR-i3a">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -180,7 +204,7 @@
<outlet property="delegate" destination="-2" id="zr5-l6-osn"/>
</connections>
</textField>
- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Rsc-fc-lz8">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="Rsc-fc-lz8">
<rect key="frame" x="30" y="140" width="426" height="18"/>
<buttonCell key="cell" type="check" title="Upnp enabled" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="N5h-tI-ZLz">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -190,8 +214,12 @@
<action selector="toggleUpnp:" target="-2" id="pl8-QR-BBc"/>
</connections>
</button>
- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="p00-of-ToC">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="p00-of-ToC">
<rect key="frame" x="532" y="330" width="30" height="30"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="30" id="2ib-pL-Iah"/>
+ <constraint firstAttribute="height" constant="30" id="cbq-Gc-goJ"/>
+ </constraints>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_delete" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="u1c-BX-hXL">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -200,7 +228,7 @@
<action selector="removeAccount:" target="-2" id="uzp-ub-gsq"/>
</connections>
</button>
- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TiO-iR-TOU">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="TiO-iR-TOU">
<rect key="frame" x="154" y="19" width="42" height="18"/>
<buttonCell key="cell" type="radio" title="SIP" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="jch-Qt-hTO">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -210,15 +238,18 @@
<action selector="toggleDTMFType:" target="-2" id="tKb-Id-onp"/>
</connections>
</button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5JS-d0-0CC">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5JS-d0-0CC">
<rect key="frame" x="30" y="33" width="121" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="117" id="QY2-iW-z5a"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="DTMF tone type" id="Rg8-qR-h1X">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ATi-aw-lOp">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="ATi-aw-lOp">
<rect key="frame" x="154" y="41" width="47" height="18"/>
<buttonCell key="cell" type="radio" title="RTP" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="0D8-im-2uM">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -230,11 +261,51 @@
</button>
</subviews>
<constraints>
+ <constraint firstItem="Btb-K1-phc" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="58" id="02j-p1-vc3"/>
+ <constraint firstItem="7wz-eU-lJh" firstAttribute="baseline" secondItem="Ilk-QS-8PT" secondAttribute="baseline" id="0tS-nT-Ad3"/>
+ <constraint firstItem="TiO-iR-TOU" firstAttribute="top" secondItem="ATi-aw-lOp" secondAttribute="bottom" constant="6" symbolic="YES" id="1sm-9b-Drn"/>
+ <constraint firstItem="Ilk-QS-8PT" firstAttribute="trailing" secondItem="VuA-jX-Kqu" secondAttribute="trailing" id="6by-7J-BZq"/>
+ <constraint firstItem="T5L-Hx-tAq" firstAttribute="leading" secondItem="a4o-bf-KQu" secondAttribute="leading" id="86R-RY-X82"/>
+ <constraint firstItem="Rsc-fc-lz8" firstAttribute="leading" secondItem="T5L-Hx-tAq" secondAttribute="leading" id="AEZ-dA-ag4"/>
+ <constraint firstItem="a4o-bf-KQu" firstAttribute="leading" secondItem="5JS-d0-0CC" secondAttribute="leading" id="DcM-RL-fnb"/>
+ <constraint firstItem="Rsc-fc-lz8" firstAttribute="top" secondItem="POs-9R-DUW" secondAttribute="bottom" constant="18" id="GSg-HW-W8s"/>
+ <constraint firstItem="T5L-Hx-tAq" firstAttribute="top" secondItem="Rsc-fc-lz8" secondAttribute="bottom" constant="16" id="H5c-Bw-EuR"/>
<constraint firstItem="POs-9R-DUW" firstAttribute="leading" secondItem="3ZB-JI-U6Y" secondAttribute="trailing" constant="8" id="I7j-dS-1py"/>
+ <constraint firstAttribute="trailing" secondItem="p00-of-ToC" secondAttribute="trailing" constant="20" symbolic="YES" id="IzJ-IM-9AB"/>
+ <constraint firstItem="Rsc-fc-lz8" firstAttribute="trailing" secondItem="T5L-Hx-tAq" secondAttribute="trailing" id="JlA-2p-9dJ"/>
+ <constraint firstItem="x2R-Ot-MbT" firstAttribute="leading" secondItem="Otd-nX-zTh" secondAttribute="leading" id="LeR-6H-gXC"/>
+ <constraint firstItem="a4o-bf-KQu" firstAttribute="baseline" secondItem="y8K-Hi-TMC" secondAttribute="baseline" id="NFa-EB-UB7"/>
+ <constraint firstItem="0Ej-Lr-p20" firstAttribute="top" secondItem="VuA-jX-Kqu" secondAttribute="bottom" constant="18" id="PBZ-M4-5sf"/>
+ <constraint firstItem="POs-9R-DUW" firstAttribute="top" secondItem="0Ej-Lr-p20" secondAttribute="bottom" constant="18" id="QTS-pp-LGa"/>
+ <constraint firstItem="POs-9R-DUW" firstAttribute="baseline" secondItem="Otd-nX-zTh" secondAttribute="baseline" id="QfC-xC-fSj"/>
+ <constraint firstItem="7fA-3M-fa5" firstAttribute="baseline" secondItem="0Ej-Lr-p20" secondAttribute="baseline" id="RcQ-vY-MNR"/>
+ <constraint firstItem="Ilk-QS-8PT" firstAttribute="leading" secondItem="VuA-jX-Kqu" secondAttribute="leading" id="ScZ-ku-Qt6"/>
+ <constraint firstItem="Btb-K1-phc" firstAttribute="top" secondItem="1IP-mF-EDC" secondAttribute="bottom" constant="8" symbolic="YES" id="TAM-s6-qAk"/>
+ <constraint firstItem="Btb-K1-phc" firstAttribute="baseline" secondItem="VuA-jX-Kqu" secondAttribute="baseline" id="a4x-68-V3a"/>
+ <constraint firstItem="5JS-d0-0CC" firstAttribute="top" secondItem="a4o-bf-KQu" secondAttribute="bottom" constant="31" id="akw-zG-Z4G"/>
<constraint firstItem="VuA-jX-Kqu" firstAttribute="leading" secondItem="Btb-K1-phc" secondAttribute="trailing" constant="8" id="dlB-OY-I2d"/>
+ <constraint firstItem="x2R-Ot-MbT" firstAttribute="leading" secondItem="0Ej-Lr-p20" secondAttribute="trailing" constant="8" symbolic="YES" id="exl-et-srf"/>
<constraint firstItem="0Ej-Lr-p20" firstAttribute="leading" secondItem="VuA-jX-Kqu" secondAttribute="leading" id="fSc-SN-jcG"/>
+ <constraint firstItem="Rsc-fc-lz8" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="32" id="fah-vG-Bbw"/>
+ <constraint firstItem="Ilk-QS-8PT" firstAttribute="top" secondItem="h5v-jy-4zX" secondAttribute="bottom" constant="6" id="fm7-AZ-P8e"/>
+ <constraint firstItem="a4o-bf-KQu" firstAttribute="top" secondItem="T5L-Hx-tAq" secondAttribute="bottom" constant="17" id="g8X-uT-844"/>
+ <constraint firstItem="h5v-jy-4zX" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="20" symbolic="YES" id="gQs-pR-Wa3"/>
+ <constraint firstItem="Ilk-QS-8PT" firstAttribute="leading" secondItem="7wz-eU-lJh" secondAttribute="trailing" constant="8" symbolic="YES" id="gXl-g0-zFa"/>
+ <constraint firstItem="h5v-jy-4zX" firstAttribute="top" secondItem="p00-of-ToC" secondAttribute="top" id="iP9-fP-Vgi"/>
+ <constraint firstItem="TiO-iR-TOU" firstAttribute="top" secondItem="ATi-aw-lOp" secondAttribute="bottom" constant="6" id="jWm-jt-2fo"/>
<constraint firstItem="y8K-Hi-TMC" firstAttribute="leading" secondItem="a4o-bf-KQu" secondAttribute="trailing" constant="8" id="joX-fO-ZF6"/>
+ <constraint firstItem="h5v-jy-4zX" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" symbolic="YES" id="jvd-5E-ELU"/>
+ <constraint firstItem="ATi-aw-lOp" firstAttribute="leading" secondItem="5JS-d0-0CC" secondAttribute="trailing" constant="6" symbolic="YES" id="kqB-ur-VHO"/>
+ <constraint firstItem="VuA-jX-Kqu" firstAttribute="trailing" secondItem="0Ej-Lr-p20" secondAttribute="trailing" id="kvC-h2-4aI"/>
<constraint firstItem="POs-9R-DUW" firstAttribute="leading" secondItem="VuA-jX-Kqu" secondAttribute="leading" id="pMK-S0-Fo4"/>
+ <constraint firstItem="ATi-aw-lOp" firstAttribute="leading" secondItem="TiO-iR-TOU" secondAttribute="leading" id="pom-Sy-lYb"/>
+ <constraint firstItem="Otd-nX-zTh" firstAttribute="leading" secondItem="POs-9R-DUW" secondAttribute="trailing" constant="8" symbolic="YES" id="u5z-hY-991"/>
+ <constraint firstItem="Otd-nX-zTh" firstAttribute="trailing" secondItem="Rsc-fc-lz8" secondAttribute="trailing" id="uS1-sG-02m"/>
+ <constraint firstItem="h5v-jy-4zX" firstAttribute="leading" secondItem="1IP-mF-EDC" secondAttribute="leading" id="vaP-I3-Bar"/>
+ <constraint firstItem="0Ej-Lr-p20" firstAttribute="top" secondItem="x2R-Ot-MbT" secondAttribute="top" id="yff-K0-lVz"/>
+ <constraint firstItem="3ZB-JI-U6Y" firstAttribute="top" secondItem="POs-9R-DUW" secondAttribute="top" id="zTM-fU-L3O"/>
+ <constraint firstItem="VuA-jX-Kqu" firstAttribute="top" secondItem="Ilk-QS-8PT" secondAttribute="bottom" constant="39" id="zXV-S3-dmt"/>
+ <constraint firstItem="ATi-aw-lOp" firstAttribute="top" secondItem="a4o-bf-KQu" secondAttribute="bottom" constant="23" id="zeU-0O-mqX"/>
<constraint firstItem="0Ej-Lr-p20" firstAttribute="leading" secondItem="7fA-3M-fa5" secondAttribute="trailing" constant="8" id="zhV-Nm-bmz"/>
</constraints>
<point key="canvasLocation" x="13" y="37"/>
diff --git a/ui/Base.lproj/AccRing.xib b/ui/Base.lproj/AccRing.xib
index 602c6ba44fdbb7f0c5f8a5bd0bd354cddf928920..d1b294bef7d4b453b6924a8a735daf6c8f16678b 100644
--- a/ui/Base.lproj/AccRing.xib
+++ b/ui/Base.lproj/AccRing.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccRingVC">
@@ -26,7 +26,7 @@
<rect key="frame" x="0.0" y="0.0" width="629" height="464"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FlW-Vd-Eem">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FlW-Vd-Eem">
<rect key="frame" x="38" y="236" width="112" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Bootstrap server" id="B6b-iB-REZ">
<font key="font" metaFont="system"/>
@@ -34,23 +34,29 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4QL-FW-Kjb">
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4QL-FW-Kjb">
<rect key="frame" x="40" y="301" width="571" height="24"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="24" id="PLh-Bg-UXZ"/>
+ </constraints>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="This is your RingID. Copy and share it with your friends!" id="bca-Wv-Xul">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="P8b-Ru-H5G">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P8b-Ru-H5G">
<rect key="frame" x="18" y="332" width="97" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="93" id="vYc-ad-Epx"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Ring Identifier" id="dPO-b1-o58">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DUI-3g-gHb">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DUI-3g-gHb">
<rect key="frame" x="18" y="102" width="85" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="81" id="QUl-KS-t7T"/>
@@ -61,16 +67,22 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iSd-2v-I3h">
- <rect key="frame" x="18" y="427" width="56" height="17"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iSd-2v-I3h">
+ <rect key="frame" x="18" y="427" width="493" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="52" id="4PJ-hh-4LN"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Account" id="1Sx-Et-CDM">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="phb-wW-DQS">
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="phb-wW-DQS">
<rect key="frame" x="156" y="233" width="303" height="22"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="303" id="XJW-G4-8oP"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="WQz-3X-MeC">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -80,8 +92,11 @@
<outlet property="delegate" destination="-2" id="2dc-GE-Fic"/>
</connections>
</textField>
- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6uh-UC-6i9">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="6uh-UC-6i9">
<rect key="frame" x="40" y="165" width="135" height="18"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="131" id="nz6-VO-e7L"/>
+ </constraints>
<buttonCell key="cell" type="check" title="Auto-answer calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="OeY-na-0YT">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -90,8 +105,11 @@
<action selector="toggleAutoAnswer:" target="-2" id="ir9-1A-f2c"/>
</connections>
</button>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e6G-kW-opo">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="e6G-kW-opo">
<rect key="frame" x="40" y="134" width="168" height="18"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="164" id="5wa-WK-mit"/>
+ </constraints>
<buttonCell key="cell" type="check" title="Use custom user-agent" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ddk-1G-0jU">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -100,8 +118,11 @@
<action selector="toggleCustomAgent:" target="-2" id="SZh-M9-dRS"/>
</connections>
</button>
- <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fJM-4J-mvZ">
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fJM-4J-mvZ">
<rect key="frame" x="214" y="132" width="195" height="22"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="195" id="WWj-hO-krj"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="Rs0-jZ-NYs">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -111,8 +132,11 @@
<outlet property="delegate" destination="-2" id="fRb-fH-3R6"/>
</connections>
</textField>
- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eaR-8q-smW">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="eaR-8q-smW">
<rect key="frame" x="40" y="195" width="110" height="18"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="106" id="jHN-QU-IsY"/>
+ </constraints>
<buttonCell key="cell" type="check" title="Upnp enabled" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="lHI-bz-ddQ">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -121,7 +145,7 @@
<action selector="toggleUpnp:" target="-2" id="Ptl-25-3Xz"/>
</connections>
</button>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="c6K-nF-ezL">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="c6K-nF-ezL">
<rect key="frame" x="40" y="44" width="571" height="18"/>
<buttonCell key="cell" type="check" title="Allow calls from peers in your call history" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="PaC-xE-SHA">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -131,7 +155,7 @@
<action selector="toggleAllowFromHistory:" target="-2" id="nl2-H4-ARL"/>
</connections>
</button>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="reK-M8-Eie">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="reK-M8-Eie">
<rect key="frame" x="40" y="71" width="571" height="18"/>
<buttonCell key="cell" type="check" title="Allow calls from unknown peers" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="kmI-jb-aal">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -141,7 +165,7 @@
<action selector="toggleAllowFromUnknown:" target="-2" id="St8-jV-rUj"/>
</connections>
</button>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zpn-KI-Jfm">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="Zpn-KI-Jfm">
<rect key="frame" x="40" y="18" width="571" height="18"/>
<buttonCell key="cell" type="check" title="Allow calls from peers in your contact list" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="fX7-9W-XFl">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -151,8 +175,11 @@
<action selector="toggleAllowFromContacts:" target="-2" id="s1A-th-o6G"/>
</connections>
</button>
- <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="D7f-4A-xXM">
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D7f-4A-xXM">
<rect key="frame" x="135" y="397" width="154" height="22"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="154" id="Gon-tm-69r"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Name or nickname..." drawsBackground="YES" id="HN3-i9-zmw">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -162,7 +189,7 @@
<outlet property="delegate" destination="-2" id="6da-DY-mtf"/>
</connections>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PJq-0f-wMN">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PJq-0f-wMN">
<rect key="frame" x="91" y="368" width="38" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Type" id="ubB-AZ-nAm">
<font key="font" metaFont="system"/>
@@ -170,34 +197,41 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="idQ-yZ-XB3">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="idQ-yZ-XB3">
<rect key="frame" x="95" y="400" width="34" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="30" id="nRP-gu-xqb"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Alias" id="Wzq-V2-YLU">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vov-vT-UPq">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vov-vT-UPq">
<rect key="frame" x="133" y="368" width="35" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="31" id="qno-t8-mLe"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="TYPE" id="Bqr-Gq-OgA">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EVi-Oa-N9k">
- <rect key="frame" x="295" y="401" width="243" height="14"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EVi-Oa-N9k">
+ <rect key="frame" x="295" y="401" width="316" height="14"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="This will be displayed to unknown peers" id="0Yt-xC-OWa">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="c6M-WV-uVk">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="c6M-WV-uVk">
<rect key="frame" x="111" y="265" width="407" height="30"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="407" id="Q9u-bY-u9w"/>
+ <constraint firstAttribute="height" constant="30" id="aBK-vN-6hT"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="border" alignment="center" id="cf0-xD-2WZ">
<font key="font" metaFont="system"/>
@@ -230,15 +264,54 @@
</subviews>
<constraints>
<constraint firstItem="Zpn-KI-Jfm" firstAttribute="leading" secondItem="reK-M8-Eie" secondAttribute="leading" id="0aK-Ci-93E"/>
+ <constraint firstItem="eaR-8q-smW" firstAttribute="top" secondItem="FlW-Vd-Eem" secondAttribute="bottom" constant="25" id="1Ac-Xz-kiF"/>
+ <constraint firstItem="D7f-4A-xXM" firstAttribute="centerY" secondItem="EVi-Oa-N9k" secondAttribute="centerY" id="3Wv-ku-nKu"/>
+ <constraint firstItem="6uh-UC-6i9" firstAttribute="top" secondItem="eaR-8q-smW" secondAttribute="bottom" constant="16" id="3sD-WB-JUQ"/>
<constraint firstAttribute="centerX" secondItem="c6M-WV-uVk" secondAttribute="centerX" id="4bm-Jh-lHq"/>
+ <constraint firstItem="DUI-3g-gHb" firstAttribute="top" secondItem="e6G-kW-opo" secondAttribute="bottom" constant="17" id="6Ox-HY-vGc"/>
+ <constraint firstItem="PJq-0f-wMN" firstAttribute="baseline" secondItem="vov-vT-UPq" secondAttribute="baseline" id="6rU-Jm-IQp"/>
<constraint firstItem="Ozb-Bq-opJ" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" id="7uN-Mu-ngw"/>
+ <constraint firstItem="PJq-0f-wMN" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="93" id="8So-0P-1Gy"/>
+ <constraint firstItem="iSd-2v-I3h" firstAttribute="top" secondItem="Ozb-Bq-opJ" secondAttribute="top" id="8c8-Pt-QMq"/>
+ <constraint firstItem="FlW-Vd-Eem" firstAttribute="baseline" secondItem="phb-wW-DQS" secondAttribute="baseline" id="9hL-zn-yqS"/>
+ <constraint firstItem="reK-M8-Eie" firstAttribute="trailing" secondItem="c6K-nF-ezL" secondAttribute="trailing" id="Bip-i0-UGG"/>
+ <constraint firstItem="idQ-yZ-XB3" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="97" id="Emn-oU-5hP"/>
+ <constraint firstItem="P8b-Ru-H5G" firstAttribute="top" secondItem="PJq-0f-wMN" secondAttribute="bottom" constant="19" id="LjN-Vg-Y4j"/>
+ <constraint firstItem="4QL-FW-Kjb" firstAttribute="top" secondItem="P8b-Ru-H5G" secondAttribute="bottom" constant="7" id="MJu-ce-p7b"/>
<constraint firstAttribute="trailing" secondItem="Ozb-Bq-opJ" secondAttribute="trailing" constant="20" id="Mbz-PD-D32"/>
+ <constraint firstItem="idQ-yZ-XB3" firstAttribute="top" secondItem="iSd-2v-I3h" secondAttribute="bottom" constant="10" id="N9g-nF-5Oc"/>
<constraint firstItem="D7f-4A-xXM" firstAttribute="leading" secondItem="idQ-yZ-XB3" secondAttribute="trailing" constant="8" id="UB7-B8-DZ4"/>
+ <constraint firstItem="e6G-kW-opo" firstAttribute="leading" secondItem="reK-M8-Eie" secondAttribute="leading" id="Uj3-sN-iro"/>
+ <constraint firstItem="Zpn-KI-Jfm" firstAttribute="top" secondItem="c6K-nF-ezL" secondAttribute="bottom" constant="12" id="Ul6-uZ-rUH"/>
+ <constraint firstItem="6uh-UC-6i9" firstAttribute="leading" secondItem="e6G-kW-opo" secondAttribute="leading" id="VEx-1I-aYY"/>
+ <constraint firstItem="eaR-8q-smW" firstAttribute="leading" secondItem="6uh-UC-6i9" secondAttribute="leading" id="Vot-8V-LMK"/>
+ <constraint firstItem="EVi-Oa-N9k" firstAttribute="top" secondItem="iSd-2v-I3h" secondAttribute="bottom" constant="12" id="Whf-mb-blO"/>
+ <constraint firstItem="iSd-2v-I3h" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="Yt2-Su-eTG"/>
<constraint firstItem="idQ-yZ-XB3" firstAttribute="trailing" secondItem="PJq-0f-wMN" secondAttribute="trailing" id="bRe-Xq-vE7"/>
+ <constraint firstItem="4QL-FW-Kjb" firstAttribute="leading" secondItem="eaR-8q-smW" secondAttribute="leading" id="d0b-y1-sUR"/>
+ <constraint firstItem="reK-M8-Eie" firstAttribute="top" secondItem="DUI-3g-gHb" secondAttribute="bottom" constant="15" id="eqT-VA-5sh"/>
+ <constraint firstItem="4QL-FW-Kjb" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="42" id="fxN-ZC-slK"/>
+ <constraint firstItem="FlW-Vd-Eem" firstAttribute="trailing" secondItem="eaR-8q-smW" secondAttribute="trailing" id="gAq-5h-P4g"/>
+ <constraint firstItem="4QL-FW-Kjb" firstAttribute="trailing" secondItem="Ozb-Bq-opJ" secondAttribute="trailing" id="gGG-0x-LhL"/>
+ <constraint firstItem="c6K-nF-ezL" firstAttribute="trailing" secondItem="Zpn-KI-Jfm" secondAttribute="trailing" id="gUO-w0-j6J"/>
+ <constraint firstItem="phb-wW-DQS" firstAttribute="top" secondItem="c6M-WV-uVk" secondAttribute="bottom" constant="10" symbolic="YES" id="gsp-Gr-Vqf"/>
+ <constraint firstAttribute="trailing" secondItem="EVi-Oa-N9k" secondAttribute="trailing" constant="20" id="h2t-Ki-rWO"/>
+ <constraint firstItem="e6G-kW-opo" firstAttribute="baseline" secondItem="fJM-4J-mvZ" secondAttribute="baseline" id="iOa-53-MkS"/>
+ <constraint firstItem="c6K-nF-ezL" firstAttribute="top" secondItem="reK-M8-Eie" secondAttribute="bottom" constant="13" id="kta-4V-sYw"/>
<constraint firstItem="fJM-4J-mvZ" firstAttribute="leading" secondItem="e6G-kW-opo" secondAttribute="trailing" constant="8" id="nAb-oD-B0a"/>
+ <constraint firstItem="c6M-WV-uVk" firstAttribute="top" secondItem="4QL-FW-Kjb" secondAttribute="bottom" constant="6" id="nCs-kI-HyR"/>
<constraint firstItem="Zpn-KI-Jfm" firstAttribute="leading" secondItem="c6K-nF-ezL" secondAttribute="leading" id="pc0-SZ-zeC"/>
<constraint firstItem="EVi-Oa-N9k" firstAttribute="leading" secondItem="D7f-4A-xXM" secondAttribute="trailing" constant="8" id="qrl-ic-eji"/>
+ <constraint firstItem="P8b-Ru-H5G" firstAttribute="leading" secondItem="DUI-3g-gHb" secondAttribute="leading" id="qti-V2-tKH"/>
+ <constraint firstItem="e6G-kW-opo" firstAttribute="top" secondItem="6uh-UC-6i9" secondAttribute="bottom" constant="17" id="ren-Fm-2Bi"/>
+ <constraint firstItem="D7f-4A-xXM" firstAttribute="leading" secondItem="vov-vT-UPq" secondAttribute="leading" id="sR5-gc-Tgp"/>
+ <constraint firstItem="4QL-FW-Kjb" firstAttribute="trailing" secondItem="reK-M8-Eie" secondAttribute="trailing" id="su4-3k-jUa"/>
+ <constraint firstItem="D7f-4A-xXM" firstAttribute="top" secondItem="iSd-2v-I3h" secondAttribute="bottom" constant="8" id="tbv-Kr-rbA"/>
<constraint firstItem="phb-wW-DQS" firstAttribute="leading" secondItem="FlW-Vd-Eem" secondAttribute="trailing" constant="8" id="uCI-Vd-ae3"/>
+ <constraint firstItem="iSd-2v-I3h" firstAttribute="leading" secondItem="P8b-Ru-H5G" secondAttribute="leading" id="waU-DP-not"/>
+ <constraint firstItem="idQ-yZ-XB3" firstAttribute="baseline" secondItem="D7f-4A-xXM" secondAttribute="baseline" id="xs3-In-hx1"/>
+ <constraint firstItem="vov-vT-UPq" firstAttribute="top" secondItem="D7f-4A-xXM" secondAttribute="bottom" constant="12" id="y7H-fe-7AY"/>
+ <constraint firstItem="FlW-Vd-Eem" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="40" id="zOA-nT-eVd"/>
</constraints>
<point key="canvasLocation" x="213.5" y="250"/>
</customView>
diff --git a/ui/Base.lproj/AudioPrefs.xib b/ui/Base.lproj/AudioPrefs.xib
index b7af8bbbc68cbd5c2807674a8476bb3b67f6347f..20faad22b2cf92a84d62c984b91a80ae669c5c71 100644
--- a/ui/Base.lproj/AudioPrefs.xib
+++ b/ui/Base.lproj/AudioPrefs.xib
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+ <capability name="Alignment constraints to the first baseline" minToolsVersion="6.0"/>
+ <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AudioPrefsVC">
@@ -20,8 +22,8 @@
<rect key="frame" x="0.0" y="0.0" width="465" height="255"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ftI-JV-7cE">
- <rect key="frame" x="19" y="218" width="80" height="17"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ftI-JV-7cE">
+ <rect key="frame" x="18" y="219" width="80" height="16"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="76" id="U53-p2-FKw"/>
</constraints>
@@ -31,7 +33,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y73-M5-wnx">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y73-M5-wnx">
<rect key="frame" x="121" y="97" width="53" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="49" id="YoW-Fo-dqV"/>
@@ -42,7 +44,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="She-fN-vzD">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="She-fN-vzD">
<rect key="frame" x="103" y="194" width="49" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="45" id="rZa-0V-Bnx"/>
@@ -53,10 +55,11 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kOg-hX-1Q5">
+ <button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kOg-hX-1Q5">
<rect key="frame" x="103" y="162" width="130" height="18"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="126" id="0X5-Ea-aDR"/>
+ <constraint firstAttribute="height" constant="14" id="Ian-yn-0fP"/>
</constraints>
<buttonCell key="cell" type="check" title="Always recording" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="jeD-Nk-KHA">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -66,8 +69,11 @@
<action selector="toggleAlwaysRecording:" target="-2" id="sOq-tA-ZBV"/>
</connections>
</button>
- <popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9SA-9E-IzQ" userLabel="Outputs">
+ <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9SA-9E-IzQ" userLabel="Outputs">
<rect key="frame" x="178" y="92" width="206" height="26"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="201" id="vOX-51-SvC"/>
+ </constraints>
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="4Fp-hR-KdJ">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -81,7 +87,7 @@
<action selector="chooseOutput:" target="-2" id="SIh-kG-rV5"/>
</connections>
</popUpButton>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bMB-Zm-k0Z">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bMB-Zm-k0Z">
<rect key="frame" x="20" y="124" width="99" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="95" id="D55-zT-N7E"/>
@@ -92,7 +98,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jyg-5H-Ygw">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="Jyg-5H-Ygw">
<rect key="frame" x="178" y="18" width="94" height="18"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="90" id="xiQ-fa-bWr"/>
@@ -105,7 +111,7 @@
<action selector="toggleMuteDTMF:" target="-2" id="RNQ-D2-2m6"/>
</connections>
</button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wn2-fz-UW2">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wn2-fz-UW2">
<rect key="frame" x="132" y="56" width="42" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="38" id="f3z-ah-7gg"/>
@@ -116,7 +122,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bK9-uH-jDb" userLabel="Inputs">
+ <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bK9-uH-jDb" userLabel="Inputs">
<rect key="frame" x="178" y="51" width="206" height="26"/>
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="3mj-4K-xif">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -131,8 +137,11 @@
<action selector="chooseInput:" target="-2" id="ADO-Qj-tAz"/>
</connections>
</popUpButton>
- <pathControl verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nyE-tZ-v4C">
+ <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nyE-tZ-v4C">
<rect key="frame" x="152" y="190" width="210" height="26"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="204" id="UsR-SM-EYQ"/>
+ </constraints>
<pathCell key="cell" selectable="YES" editable="YES" alignment="left" pathStyle="popUp" id="SPB-Bz-vDM">
<font key="font" metaFont="system"/>
<url key="url" string="file://localhost/Applications/"/>
@@ -144,11 +153,28 @@
</pathControl>
</subviews>
<constraints>
+ <constraint firstAttribute="trailing" secondItem="9SA-9E-IzQ" secondAttribute="trailing" constant="84" id="0Zb-hF-biO"/>
+ <constraint firstItem="ftI-JV-7cE" firstAttribute="top" secondItem="deY-JV-Rfe" secondAttribute="top" constant="20" id="3tz-DN-1lf"/>
+ <constraint firstItem="bK9-uH-jDb" firstAttribute="top" secondItem="9SA-9E-IzQ" secondAttribute="bottom" constant="20" id="B46-DU-kIx"/>
<constraint firstItem="9SA-9E-IzQ" firstAttribute="leading" secondItem="bK9-uH-jDb" secondAttribute="leading" id="CXc-00-v8L"/>
+ <constraint firstItem="bMB-Zm-k0Z" firstAttribute="top" secondItem="kOg-hX-1Q5" secondAttribute="bottom" constant="23" id="Fo0-5T-cmf"/>
+ <constraint firstItem="bMB-Zm-k0Z" firstAttribute="leading" secondItem="deY-JV-Rfe" secondAttribute="leading" constant="22" id="GhA-ij-Oet"/>
+ <constraint firstItem="She-fN-vzD" firstAttribute="baseline" secondItem="nyE-tZ-v4C" secondAttribute="firstBaseline" id="KdN-ZV-7BY"/>
+ <constraint firstItem="Y73-M5-wnx" firstAttribute="centerY" secondItem="9SA-9E-IzQ" secondAttribute="centerY" id="Njt-Kv-M05"/>
+ <constraint firstAttribute="bottom" secondItem="Jyg-5H-Ygw" secondAttribute="bottom" constant="20" symbolic="YES" id="Oln-9b-2Ri"/>
+ <constraint firstItem="ftI-JV-7cE" firstAttribute="leading" secondItem="deY-JV-Rfe" secondAttribute="leading" constant="20" id="SL1-2n-Uik"/>
+ <constraint firstItem="Jyg-5H-Ygw" firstAttribute="top" secondItem="bK9-uH-jDb" secondAttribute="bottom" constant="20" id="VHA-pW-hf8"/>
+ <constraint firstItem="nyE-tZ-v4C" firstAttribute="top" secondItem="deY-JV-Rfe" secondAttribute="top" constant="41" id="dsL-QJ-MwJ"/>
+ <constraint firstItem="kOg-hX-1Q5" firstAttribute="top" secondItem="She-fN-vzD" secondAttribute="bottom" constant="16" id="fdW-vI-uOc"/>
+ <constraint firstItem="She-fN-vzD" firstAttribute="leading" secondItem="deY-JV-Rfe" secondAttribute="leading" constant="105" id="gLd-G7-ZVU"/>
<constraint firstItem="bK9-uH-jDb" firstAttribute="leading" secondItem="wn2-fz-UW2" secondAttribute="trailing" constant="5" id="hfr-G8-btB"/>
+ <constraint firstItem="bMB-Zm-k0Z" firstAttribute="top" secondItem="ftI-JV-7cE" secondAttribute="bottom" constant="77" id="nma-zT-ejt"/>
+ <constraint firstItem="9SA-9E-IzQ" firstAttribute="trailing" secondItem="bK9-uH-jDb" secondAttribute="trailing" id="pJV-4e-1EB"/>
+ <constraint firstItem="wn2-fz-UW2" firstAttribute="centerY" secondItem="bK9-uH-jDb" secondAttribute="centerY" id="ryI-F3-Zga"/>
<constraint firstItem="9SA-9E-IzQ" firstAttribute="leading" secondItem="Y73-M5-wnx" secondAttribute="trailing" constant="5" id="te2-Bj-JJV"/>
<constraint firstItem="nyE-tZ-v4C" firstAttribute="leading" secondItem="She-fN-vzD" secondAttribute="trailing" constant="5" id="w8a-Pj-Dsq"/>
<constraint firstItem="9SA-9E-IzQ" firstAttribute="leading" secondItem="Jyg-5H-Ygw" secondAttribute="leading" id="wSL-sj-u5S"/>
+ <constraint firstItem="She-fN-vzD" firstAttribute="leading" secondItem="kOg-hX-1Q5" secondAttribute="leading" id="yol-9U-IE6"/>
</constraints>
<point key="canvasLocation" x="170.5" y="41.5"/>
</customView>
diff --git a/ui/Base.lproj/Conversation.xib b/ui/Base.lproj/Conversation.xib
index 197efc25216b545cf72326848c7af0053f46bc76..579079e5ad22abea1c7c0670c9df1690aebb42b1 100644
--- a/ui/Base.lproj/Conversation.xib
+++ b/ui/Base.lproj/Conversation.xib
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+ <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="ConversationVC">
@@ -22,17 +23,17 @@
<rect key="frame" x="0.0" y="0.0" width="798" height="586"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <customView ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EJD-f8-Xqd">
- <rect key="frame" x="20" y="58" width="758" height="475"/>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="EJD-f8-Xqd">
+ <rect key="frame" x="0.0" y="58" width="798" height="475"/>
<subviews>
- <scrollView ambiguous="YES" misplaced="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" scrollerKnobStyle="dark" translatesAutoresizingMaskIntoConstraints="NO" id="Ez2-Rf-DZN">
- <rect key="frame" x="29" y="0.0" width="700" height="475"/>
+ <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" scrollerKnobStyle="dark" translatesAutoresizingMaskIntoConstraints="NO" id="Ez2-Rf-DZN">
+ <rect key="frame" x="49" y="0.0" width="700" height="475"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="ofC-Bs-tHR">
<rect key="frame" x="0.0" y="0.0" width="700" height="475"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" autosaveColumns="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="hwp-Th-i2d" id="bOO-CW-S21">
- <rect key="frame" x="0.0" y="0.0" width="700" height="0.0"/>
+ <rect key="frame" x="0.0" y="0.0" width="700" height="475"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
@@ -116,7 +117,6 @@
</connections>
</outlineView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<constraints>
<constraint firstAttribute="width" constant="700" id="hVv-sa-XIA"/>
@@ -186,25 +186,11 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <customView ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Rth-di-Tls">
- <rect key="frame" x="20" y="0.0" width="758" height="50"/>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="Rth-di-Tls">
+ <rect key="frame" x="0.0" y="0.0" width="798" height="50"/>
<subviews>
- <button verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="cFH-d7-Erh" userLabel="Call Button" customClass="IconButton">
- <rect key="frame" x="20" y="5" width="40" height="40"/>
- <constraints>
- <constraint firstAttribute="width" constant="40" id="4jd-jn-RY1"/>
- <constraint firstAttribute="height" constant="40" id="DMa-Lq-2Tk"/>
- </constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_video" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="XOS-rh-WfH">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="placeCall:" target="-2" id="2h9-fM-gof"/>
- </connections>
- </button>
- <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bsk-Gj-qQ2">
- <rect key="frame" x="68" y="5" width="622" height="40"/>
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bsk-Gj-qQ2">
+ <rect key="frame" x="68" y="5" width="662" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="vko-v6-6CX"/>
</constraints>
@@ -225,8 +211,8 @@
<outlet property="delegate" destination="-2" id="2u2-D4-htz"/>
</connections>
</textField>
- <button verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UJf-cF-RAo" customClass="IconButton">
- <rect key="frame" x="698" y="5" width="40" height="40"/>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UJf-cF-RAo" customClass="IconButton">
+ <rect key="frame" x="738" y="5" width="40" height="40"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="TmF-ip-m4C"/>
<constraint firstAttribute="height" constant="40" id="rbQ-lE-sAq"/>
@@ -240,12 +226,30 @@
<binding destination="-2" name="enabled" keyPath="self.message.length" id="ZmZ-2N-CPX"/>
</connections>
</button>
+ <button verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="cFH-d7-Erh" userLabel="Call Button" customClass="IconButton">
+ <rect key="frame" x="20" y="5" width="40" height="40"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="40" id="4jd-jn-RY1"/>
+ <constraint firstAttribute="height" constant="40" id="DMa-Lq-2Tk"/>
+ </constraints>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_video" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="XOS-rh-WfH">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="placeCall:" target="-2" id="2h9-fM-gof"/>
+ </connections>
+ </button>
</subviews>
<constraints>
<constraint firstItem="cFH-d7-Erh" firstAttribute="top" secondItem="Rth-di-Tls" secondAttribute="top" constant="5" id="2zJ-2h-dLg"/>
<constraint firstAttribute="height" constant="50" id="8Xk-CO-d9I"/>
+ <constraint firstItem="UJf-cF-RAo" firstAttribute="leading" secondItem="bsk-Gj-qQ2" secondAttribute="trailing" constant="8" id="ADK-NR-ZMJ"/>
<constraint firstItem="UJf-cF-RAo" firstAttribute="centerY" secondItem="Rth-di-Tls" secondAttribute="centerY" id="IEk-Ts-gBA"/>
+ <constraint firstAttribute="bottom" secondItem="bsk-Gj-qQ2" secondAttribute="bottom" constant="5" id="NYK-6e-w8C"/>
<constraint firstItem="cFH-d7-Erh" firstAttribute="leading" secondItem="Rth-di-Tls" secondAttribute="leading" constant="20" id="TFr-St-w0Q"/>
+ <constraint firstAttribute="trailing" secondItem="UJf-cF-RAo" secondAttribute="trailing" constant="20" id="XqO-dy-4yf"/>
+ <constraint firstItem="bsk-Gj-qQ2" firstAttribute="top" secondItem="Rth-di-Tls" secondAttribute="top" constant="5" id="bpr-MK-LFn"/>
<constraint firstItem="bsk-Gj-qQ2" firstAttribute="leading" secondItem="cFH-d7-Erh" secondAttribute="trailing" constant="8" id="cMh-IX-Iur"/>
<constraint firstAttribute="bottom" secondItem="cFH-d7-Erh" secondAttribute="bottom" constant="5" id="xpg-xe-2dT"/>
</constraints>
@@ -270,11 +274,14 @@
<constraint firstItem="Rth-di-Tls" firstAttribute="leading" secondItem="EJD-f8-Xqd" secondAttribute="leading" id="Ijp-QX-Dkw"/>
<constraint firstItem="ucx-6g-eJw" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Pd6-AZ-mue"/>
<constraint firstItem="Uqj-Xr-xl5" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Tzd-wA-uMM"/>
+ <constraint firstItem="xdB-aI-PSs" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ucx-6g-eJw" secondAttribute="trailing" constant="5" id="U7E-ud-cgV"/>
<constraint firstItem="EJD-f8-Xqd" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="bvr-Gv-Sgb"/>
<constraint firstItem="ooq-vs-Xt1" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="cQe-IU-Fcd"/>
<constraint firstItem="ooq-vs-Xt1" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="12" id="gkR-53-qs5"/>
+ <constraint firstAttribute="trailing" secondItem="Rth-di-Tls" secondAttribute="trailing" id="iT0-rG-86d"/>
<constraint firstItem="EJD-f8-Xqd" firstAttribute="top" secondItem="ooq-vs-Xt1" secondAttribute="bottom" constant="1" id="mJI-DZ-n2l"/>
<constraint firstItem="Rth-di-Tls" firstAttribute="trailing" secondItem="EJD-f8-Xqd" secondAttribute="trailing" id="mga-Tu-Ikb"/>
+ <constraint firstItem="Rth-di-Tls" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="qz7-sE-9Ml"/>
<constraint firstItem="Uqj-Xr-xl5" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="tmm-4H-81S"/>
<constraint firstItem="xdB-aI-PSs" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="21" id="yBE-OM-E6U"/>
<constraint firstAttribute="bottom" secondItem="EJD-f8-Xqd" secondAttribute="bottom" constant="58" id="zTa-in-4Jj"/>
diff --git a/ui/Base.lproj/GeneralPrefs.xib b/ui/Base.lproj/GeneralPrefs.xib
index 78ef34d70d98be59a7d549e3f72f4db1ad0cc5a5..6fc84b0e326cbddd27a3f0542b4b1eb805780b18 100644
--- a/ui/Base.lproj/GeneralPrefs.xib
+++ b/ui/Base.lproj/GeneralPrefs.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="GeneralPrefsVC">
@@ -22,19 +22,25 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="c22-O7-iKe">
- <rect key="frame" x="0.0" y="0.0" width="546" height="421"/>
+ <rect key="frame" x="0.0" y="0.0" width="497" height="421"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <textField toolTip="Profile" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MV1-AC-qE7">
+ <textField toolTip="Profile" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MV1-AC-qE7">
<rect key="frame" x="30" y="384" width="79" height="17"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="75" id="Nj8-qG-TRL"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Profile" id="Thg-oC-5Qw">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Mjw-8U-dzO">
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mjw-8U-dzO">
<rect key="frame" x="210" y="305" width="197" height="22"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="197" id="pDD-Xk-k4K"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="blA-9U-jdI">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -44,7 +50,7 @@
<outlet property="delegate" destination="-2" id="SbF-hg-KD0"/>
</connections>
</textField>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Oth-up-2k2">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="Oth-up-2k2">
<rect key="frame" x="56" y="232" width="197" height="18"/>
<buttonCell key="cell" type="check" title="Enable Desktop Notifications" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uCL-ye-tsv">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -54,7 +60,7 @@
<binding destination="Sz0-vm-i3t" name="value" keyPath="values.enable_notifications" id="PuD-KZ-Zat"/>
</connections>
</button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j3T-5j-Fom">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="j3T-5j-Fom">
<rect key="frame" x="30" y="256" width="162" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Behaviours" id="Rzy-Gh-3wQ">
<font key="font" metaFont="systemBold"/>
@@ -62,8 +68,11 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1Nr-L4-fcd">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="1Nr-L4-fcd">
<rect key="frame" x="56" y="178" width="136" height="18"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="132" id="8Mk-zb-NLA"/>
+ </constraints>
<buttonCell key="cell" type="check" title="Launch on Startup" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="O2C-xR-mHF">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -72,7 +81,7 @@
<action selector="toggleLaunchAtStartup:" target="-2" id="Rky-YK-2yk"/>
</connections>
</button>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DgD-2y-4g5">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="DgD-2y-4g5">
<rect key="frame" x="56" y="125" width="153" height="18"/>
<buttonCell key="cell" type="check" title="Keep my history for" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="3Pb-Ec-zl5">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -82,15 +91,15 @@
<action selector="toggleHistory:" target="-2" id="2wV-yt-1YG"/>
</connections>
</button>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QmA-ZI-ZL5">
- <rect key="frame" x="251" y="120" width="19" height="27"/>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QmA-ZI-ZL5">
+ <rect key="frame" x="242" y="120" width="19" height="27"/>
<stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" doubleValue="30" id="30B-YQ-Opa"/>
<connections>
<binding destination="Sz0-vm-i3t" name="value" keyPath="values.history_limit" id="c2j-mK-kYa"/>
</connections>
</stepper>
- <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tHZ-7Q-5iP">
- <rect key="frame" x="206" y="123" width="40" height="22"/>
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tHZ-7Q-5iP">
+ <rect key="frame" x="197" y="123" width="40" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="Qal-Za-gWz"/>
</constraints>
@@ -107,8 +116,8 @@
</binding>
</connections>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nah-Jm-ZYB">
- <rect key="frame" x="273" y="125" width="33" height="17"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nah-Jm-ZYB">
+ <rect key="frame" x="264" y="125" width="33" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="29" id="08C-IP-5pg"/>
</constraints>
@@ -118,8 +127,11 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="U84-le-Iy4">
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="U84-le-Iy4">
<rect key="frame" x="58" y="93" width="122" height="19"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="122" id="3MQ-xB-seJ"/>
+ </constraints>
<buttonCell key="cell" type="roundRect" title="Clear History" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cd5-9L-Bbb">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="cellTitle"/>
@@ -129,9 +141,9 @@
</connections>
</button>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="yVO-jk-ay3">
- <rect key="frame" x="20" y="20" width="506" height="61"/>
+ <rect key="frame" x="20" y="20" width="457" height="61"/>
<subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="diX-uH-Ce8">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="diX-uH-Ce8">
<rect key="frame" x="18" y="44" width="52" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Update" id="r4u-t3-gBc">
<font key="font" metaFont="systemBold"/>
@@ -139,15 +151,21 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MCd-PD-kd7">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="MCd-PD-kd7">
<rect key="frame" x="43" y="18" width="221" height="18"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="217" id="eye-Ia-lhy"/>
+ </constraints>
<buttonCell key="cell" type="check" title="Automatically check for updates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="T3a-yx-ZaW">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
- <popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RYP-3d-PCa" userLabel="Update interval">
+ <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RYP-3d-PCa" userLabel="Update interval">
<rect key="frame" x="268" y="12" width="100" height="26"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="95" id="oLq-z9-b9M"/>
+ </constraints>
<popUpButtonCell key="cell" type="push" title="Monthly" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="2629800" imageScaling="proportionallyDown" inset="2" selectedItem="42E-UY-qlP" id="tTF-gp-Rti">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -167,11 +185,13 @@
<constraint firstItem="MCd-PD-kd7" firstAttribute="top" secondItem="diX-uH-Ce8" secondAttribute="bottom" constant="10" id="5Uq-c4-XfL"/>
<constraint firstItem="RYP-3d-PCa" firstAttribute="leading" secondItem="MCd-PD-kd7" secondAttribute="trailing" constant="8" id="9c7-7m-udP"/>
<constraint firstItem="diX-uH-Ce8" firstAttribute="leading" secondItem="yVO-jk-ay3" secondAttribute="leading" constant="20" id="DWV-bf-QJe"/>
+ <constraint firstItem="RYP-3d-PCa" firstAttribute="top" secondItem="yVO-jk-ay3" secondAttribute="top" constant="25" id="Nm1-FO-0Hr"/>
<constraint firstItem="MCd-PD-kd7" firstAttribute="leading" secondItem="yVO-jk-ay3" secondAttribute="leading" constant="45" id="ZO7-pl-ug1"/>
+ <constraint firstItem="diX-uH-Ce8" firstAttribute="top" secondItem="yVO-jk-ay3" secondAttribute="top" id="uF2-Tp-YBe"/>
</constraints>
</customView>
- <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Gyi-ID-Z3v">
- <rect key="frame" x="310" y="126" width="169" height="14"/>
+ <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Gyi-ID-Z3v">
+ <rect key="frame" x="301" y="126" width="169" height="14"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="165" id="wfZ-X2-WX8"/>
</constraints>
@@ -181,14 +201,18 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fC0-ce-Yiz">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fC0-ce-Yiz">
<rect key="frame" x="18" y="147" width="399" height="17"/>
<constraints>
+ <constraint firstAttribute="width" constant="395" id="6HO-p7-tAk"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="48" id="JrN-bM-7Wz"/>
</constraints>
</textField>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Is4-pD-LOT">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="Is4-pD-LOT">
<rect key="frame" x="56" y="205" width="294" height="18"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="290" id="iUi-lt-J9M"/>
+ </constraints>
<buttonCell key="cell" type="check" title="Bring Ring to foreground on incoming calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uYI-hA-JHk">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -197,8 +221,11 @@
<binding destination="Sz0-vm-i3t" name="value" keyPath="values.window_behaviour" id="ZSW-he-LAz"/>
</connections>
</button>
- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="L6I-bx-LnN">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="L6I-bx-LnN">
<rect key="frame" x="132" y="281" width="70" height="70"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="70" id="gAI-0Z-pME"/>
+ </constraints>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSUser" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="8lT-0k-EYB">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -207,8 +234,8 @@
<action selector="editPhoto:" target="-2" id="VuT-vf-PDV"/>
</connections>
</button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="c9L-Qb-bNK">
- <rect key="frame" x="42" y="359" width="486" height="17"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="c9L-Qb-bNK">
+ <rect key="frame" x="42" y="359" width="477" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="This is shared with your contacts " id="vbU-2S-O58">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -217,41 +244,49 @@
</textField>
</subviews>
<constraints>
+ <constraint firstItem="QmA-ZI-ZL5" firstAttribute="centerY" secondItem="nah-Jm-ZYB" secondAttribute="centerY" id="2CN-A5-Lfs"/>
<constraint firstItem="fC0-ce-Yiz" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" id="2iV-DB-Zna"/>
+ <constraint firstItem="1Nr-L4-fcd" firstAttribute="leading" secondItem="DgD-2y-4g5" secondAttribute="leading" id="3wo-TW-rpe"/>
+ <constraint firstItem="DgD-2y-4g5" firstAttribute="baseline" secondItem="tHZ-7Q-5iP" secondAttribute="baseline" id="9yS-UP-Xii"/>
+ <constraint firstItem="j3T-5j-Fom" firstAttribute="trailing" secondItem="1Nr-L4-fcd" secondAttribute="trailing" id="Ctf-2q-EwC"/>
<constraint firstItem="Gyi-ID-Z3v" firstAttribute="leading" secondItem="nah-Jm-ZYB" secondAttribute="trailing" constant="8" id="EYY-WC-fCM"/>
+ <constraint firstItem="MV1-AC-qE7" firstAttribute="leading" secondItem="j3T-5j-Fom" secondAttribute="leading" id="Ere-Nv-hlR"/>
<constraint firstItem="Oth-up-2k2" firstAttribute="leading" secondItem="Is4-pD-LOT" secondAttribute="leading" id="Fdb-2p-ULe"/>
+ <constraint firstItem="c9L-Qb-bNK" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="44" id="Fei-kE-ggH"/>
+ <constraint firstItem="c9L-Qb-bNK" firstAttribute="trailing" secondItem="yVO-jk-ay3" secondAttribute="trailing" constant="40" id="GMc-d7-Qoe"/>
+ <constraint firstItem="1Nr-L4-fcd" firstAttribute="top" secondItem="Is4-pD-LOT" secondAttribute="bottom" constant="13" id="IQl-Me-RRm"/>
<constraint firstItem="nah-Jm-ZYB" firstAttribute="leading" secondItem="QmA-ZI-ZL5" secondAttribute="trailing" constant="8" id="JJi-0O-nUi"/>
+ <constraint firstItem="tHZ-7Q-5iP" firstAttribute="top" secondItem="QmA-ZI-ZL5" secondAttribute="top" id="Jrk-f0-97K"/>
+ <constraint firstItem="j3T-5j-Fom" firstAttribute="top" secondItem="L6I-bx-LnN" secondAttribute="bottom" constant="8" symbolic="YES" id="OMM-Ry-Zsx"/>
+ <constraint firstItem="L6I-bx-LnN" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="132" id="QTU-A1-JdM"/>
+ <constraint firstItem="tHZ-7Q-5iP" firstAttribute="baseline" secondItem="Gyi-ID-Z3v" secondAttribute="baseline" id="T0G-4T-FXD"/>
+ <constraint firstItem="Mjw-8U-dzO" firstAttribute="top" secondItem="c9L-Qb-bNK" secondAttribute="bottom" constant="32" id="TGb-qG-xFk"/>
+ <constraint firstItem="Oth-up-2k2" firstAttribute="top" secondItem="j3T-5j-Fom" secondAttribute="bottom" constant="8" symbolic="YES" id="XMy-vs-rqU"/>
<constraint firstItem="QmA-ZI-ZL5" firstAttribute="leading" secondItem="tHZ-7Q-5iP" secondAttribute="trailing" constant="8" id="YPs-UE-IFi"/>
+ <constraint firstAttribute="trailing" secondItem="Gyi-ID-Z3v" secondAttribute="trailing" constant="29" id="Z4C-x5-1Op"/>
<constraint firstItem="DgD-2y-4g5" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="58" id="aPM-dp-Eym"/>
<constraint firstAttribute="bottom" secondItem="yVO-jk-ay3" secondAttribute="bottom" constant="20" id="bAA-rc-QhB"/>
- <constraint firstItem="tHZ-7Q-5iP" firstAttribute="leading" secondItem="DgD-2y-4g5" secondAttribute="trailing" constant="3" id="bV5-ZQ-94d"/>
+ <constraint firstItem="tHZ-7Q-5iP" firstAttribute="leading" secondItem="DgD-2y-4g5" secondAttribute="trailing" constant="-10" id="bV5-ZQ-94d"/>
<constraint firstItem="Oth-up-2k2" firstAttribute="leading" secondItem="1Nr-L4-fcd" secondAttribute="leading" id="csu-Ug-9sD"/>
+ <constraint firstItem="MV1-AC-qE7" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="20" symbolic="YES" id="eb5-W0-5Yr"/>
+ <constraint firstItem="c9L-Qb-bNK" firstAttribute="top" secondItem="MV1-AC-qE7" secondAttribute="bottom" constant="8" symbolic="YES" id="f2T-ft-Osc"/>
+ <constraint firstItem="DgD-2y-4g5" firstAttribute="leading" secondItem="U84-le-Iy4" secondAttribute="leading" id="ggy-GJ-WMj"/>
+ <constraint firstItem="Mjw-8U-dzO" firstAttribute="leading" secondItem="L6I-bx-LnN" secondAttribute="trailing" constant="8" symbolic="YES" id="jVt-Fl-fMN"/>
+ <constraint firstItem="Is4-pD-LOT" firstAttribute="top" secondItem="Oth-up-2k2" secondAttribute="bottom" constant="13" id="lHy-u9-IB0"/>
+ <constraint firstItem="L6I-bx-LnN" firstAttribute="centerY" secondItem="Mjw-8U-dzO" secondAttribute="centerY" id="q2I-i3-D74"/>
+ <constraint firstItem="L6I-bx-LnN" firstAttribute="top" secondItem="c9L-Qb-bNK" secondAttribute="bottom" constant="8" symbolic="YES" id="qJk-WJ-ebJ"/>
<constraint firstItem="yVO-jk-ay3" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" id="qa3-OH-fvn"/>
- <constraint firstItem="fC0-ce-Yiz" firstAttribute="top" secondItem="1Nr-L4-fcd" secondAttribute="bottom" constant="8" id="tQx-o6-feR"/>
- <constraint firstItem="j3T-5j-Fom" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="32" id="twb-vI-7Ls"/>
+ <constraint firstItem="U84-le-Iy4" firstAttribute="top" secondItem="DgD-2y-4g5" secondAttribute="bottom" constant="15" id="szl-Nh-CbR"/>
+ <constraint firstItem="fC0-ce-Yiz" firstAttribute="top" secondItem="1Nr-L4-fcd" secondAttribute="bottom" constant="16" id="tQx-o6-feR"/>
+ <constraint firstItem="MV1-AC-qE7" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="32" id="vN1-5P-m9g"/>
+ <constraint firstItem="yVO-jk-ay3" firstAttribute="top" secondItem="U84-le-Iy4" secondAttribute="bottom" constant="13" id="wfT-QL-241"/>
<constraint firstAttribute="trailing" secondItem="yVO-jk-ay3" secondAttribute="trailing" constant="20" id="wig-B4-OtV"/>
+ <constraint firstItem="tHZ-7Q-5iP" firstAttribute="top" secondItem="fC0-ce-Yiz" secondAttribute="bottom" constant="2" id="wo5-OT-LTj"/>
</constraints>
- <point key="canvasLocation" x="337" y="81.5"/>
+ <point key="canvasLocation" x="312.5" y="81.5"/>
</customView>
<userDefaultsController representsSharedInstance="YES" id="Sz0-vm-i3t"/>
<customObject id="VEJ-ic-3Ub" customClass="SUUpdater"/>
- <button id="WkM-0l-ODu">
- <rect key="frame" x="0.0" y="0.0" width="61" height="18"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="f9K-yg-vBv">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- </button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="yhY-lt-Sr1">
- <rect key="frame" x="0.0" y="0.0" width="38" height="17"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="VGe-3c-dbs">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
</objects>
<resources>
<image name="NSUser" width="32" height="32"/>
diff --git a/ui/Base.lproj/PersonLinker.xib b/ui/Base.lproj/PersonLinker.xib
index f3db2ca8675db659e887ffcefd5c0a4e1fbc2210..fe6e9b47213c73222732ca0ad32b78305dda5924 100644
--- a/ui/Base.lproj/PersonLinker.xib
+++ b/ui/Base.lproj/PersonLinker.xib
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16A313a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="PersonLinkerVC">
@@ -25,6 +25,7 @@
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8pP-Sy-Vkd">
<rect key="frame" x="18" y="415" width="184" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" sendsActionOnEndEditing="YES" alignment="right" placeholderString="Contact Method" usesSingleLineMode="YES" id="a9R-r5-K3w">
<font key="font" size="18" name="HelveticaNeue-Thin"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -33,9 +34,11 @@
</textField>
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4Dh-2q-0Sm">
<rect key="frame" x="0.0" y="-21" width="308" height="428"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<searchField wantsLayer="YES" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZJY-k3-gHh">
<rect key="frame" x="20" y="406" width="268" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" sendsSearchStringImmediately="YES" id="sS1-2Z-ZWi">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -48,6 +51,7 @@
</searchField>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cfj-u3-ErF">
<rect key="frame" x="9" y="24" width="291" height="30"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="squareTextured" title="Add new contact" bezelStyle="texturedSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="had-9Y-eza">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -59,6 +63,7 @@
</button>
<scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="42" horizontalPageScroll="10" verticalLineScroll="42" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" scrollerKnobStyle="light" translatesAutoresizingMaskIntoConstraints="NO" id="sue-LK-DlA">
<rect key="frame" x="0.0" y="61" width="308" height="337"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="bpD-gC-mEn">
<rect key="frame" x="0.0" y="0.0" width="308" height="337"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -89,6 +94,7 @@
<subviews>
<textField wantsLayer="YES" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="Vix-1z-ceH">
<rect key="frame" x="60" y="20" width="219" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Display Role" id="Jcn-cg-rbR">
<font key="font" size="16" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -97,6 +103,7 @@
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="XdL-zf-7dn">
<rect key="frame" x="10" y="11" width="40" height="40"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="27s-no-TQR"/>
</imageView>
</subviews>
@@ -113,7 +120,6 @@
</connections>
</outlineView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="4Sk-mY-PsD">
<rect key="frame" x="1" y="117" width="238" height="16"/>
@@ -128,6 +134,7 @@
</customView>
<comboBox verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MFf-kv-pz3">
<rect key="frame" x="208" y="415" width="84" height="26"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" usesDataSource="YES" numberOfVisibleItems="5" id="Msw-lx-k0J">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -143,11 +150,14 @@
<point key="canvasLocation" x="578" y="354"/>
</customView>
<customView wantsLayer="YES" id="6M0-sm-haN">
- <rect key="frame" x="0.0" y="5" width="269" height="216"/>
+ <rect key="frame" x="0.0" y="0.0" width="272" height="216"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m4N-gI-w8E">
- <rect key="frame" x="12" y="112" width="245" height="27"/>
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m4N-gI-w8E">
+ <rect key="frame" x="13" y="107" width="245" height="22"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="245" id="iPe-jW-Wlk"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="First name..." drawsBackground="YES" id="vyb-95-XaF">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -158,8 +168,11 @@
<outlet property="nextKeyView" destination="j0A-7O-Bvj" id="Ub8-NO-TRg"/>
</connections>
</textField>
- <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j0A-7O-Bvj">
- <rect key="frame" x="12" y="75" width="245" height="27"/>
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="j0A-7O-Bvj">
+ <rect key="frame" x="13" y="75" width="245" height="22"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="245" id="gH8-eW-ktF"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Last name..." drawsBackground="YES" id="cGT-nu-sPa">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -170,25 +183,25 @@
<outlet property="nextKeyView" destination="N0T-7S-TCW" id="DHp-cl-011"/>
</connections>
</textField>
- <textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GgO-mM-nnz">
- <rect key="frame" x="24" y="186" width="221" height="30"/>
+ <textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GgO-mM-nnz">
+ <rect key="frame" x="74" y="192" width="125" height="24"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="New Contact" id="v7b-de-MVd">
<font key="font" metaFont="system" size="20"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <scrollView ambiguous="YES" misplaced="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vzn-cW-Vtm">
- <rect key="frame" x="26" y="146" width="217" height="32"/>
- <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="2yu-GN-mus">
- <rect key="frame" x="0.0" y="0.0" width="217" height="32"/>
+ <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vzn-cW-Vtm">
+ <rect key="frame" x="27" y="137" width="217" height="41"/>
+ <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="2yu-GN-mus">
+ <rect key="frame" x="0.0" y="0.0" width="217" height="41"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <textView ambiguous="YES" editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="TQq-By-akw">
- <rect key="frame" x="0.0" y="0.0" width="217" height="32"/>
+ <textView editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="TQq-By-akw">
+ <rect key="frame" x="0.0" y="0.0" width="217" height="41"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
- <size key="minSize" width="217" height="32"/>
+ <size key="minSize" width="217" height="41"/>
<size key="maxSize" width="463" height="10000000"/>
<attributedString key="textStorage">
<fragment content="This contact will be added to your iCloud contacts ">
@@ -199,23 +212,27 @@
</fragment>
</attributedString>
<color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <size key="minSize" width="217" height="32"/>
- <size key="maxSize" width="463" height="10000000"/>
</textView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
+ <constraints>
+ <constraint firstAttribute="height" constant="41" id="evf-4R-Uy9"/>
+ <constraint firstAttribute="width" constant="217" id="rLb-RB-QaL"/>
+ </constraints>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="XUh-Co-vZc">
<rect key="frame" x="-100" y="-100" width="87" height="18"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="C83-CS-odD">
- <rect key="frame" x="-16" y="0.0" width="16" height="0.0"/>
+ <rect key="frame" x="201" y="0.0" width="16" height="41"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
- <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="N0T-7S-TCW">
- <rect key="frame" x="12" y="38" width="245" height="30"/>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N0T-7S-TCW">
+ <rect key="frame" x="95" y="38" width="81" height="25"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="81" id="gX5-8a-8bp"/>
+ </constraints>
<buttonCell key="cell" type="squareTextured" title="Create" bezelStyle="texturedSquare" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="qZc-Z2-TpP">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -228,14 +245,17 @@
</subviews>
<constraints>
<constraint firstAttribute="centerX" secondItem="m4N-gI-w8E" secondAttribute="centerX" id="4IS-12-aeP"/>
- <constraint firstAttribute="trailing" secondItem="N0T-7S-TCW" secondAttribute="trailing" constant="12" id="C3n-ql-y7T"/>
+ <constraint firstItem="N0T-7S-TCW" firstAttribute="top" secondItem="j0A-7O-Bvj" secondAttribute="bottom" constant="13" id="FM4-Ux-d1v"/>
<constraint firstAttribute="centerX" secondItem="j0A-7O-Bvj" secondAttribute="centerX" id="JAP-Mr-JWl"/>
- <constraint firstAttribute="bottom" secondItem="N0T-7S-TCW" secondAttribute="bottom" constant="40" id="WLz-RD-syK"/>
+ <constraint firstItem="vzn-cW-Vtm" firstAttribute="top" secondItem="GgO-mM-nnz" secondAttribute="bottom" constant="14" id="RXK-45-m86"/>
+ <constraint firstItem="N0T-7S-TCW" firstAttribute="centerX" secondItem="6M0-sm-haN" secondAttribute="centerX" id="bFE-4h-t1h"/>
+ <constraint firstItem="GgO-mM-nnz" firstAttribute="top" secondItem="6M0-sm-haN" secondAttribute="top" id="ev3-6v-7uJ"/>
<constraint firstAttribute="centerX" secondItem="vzn-cW-Vtm" secondAttribute="centerX" id="ltD-l2-ESu"/>
- <constraint firstItem="N0T-7S-TCW" firstAttribute="leading" secondItem="6M0-sm-haN" secondAttribute="leading" constant="12" id="xWn-BX-TdQ"/>
+ <constraint firstItem="j0A-7O-Bvj" firstAttribute="top" secondItem="m4N-gI-w8E" secondAttribute="bottom" constant="10" id="oZj-eA-5pT"/>
+ <constraint firstItem="m4N-gI-w8E" firstAttribute="top" secondItem="vzn-cW-Vtm" secondAttribute="bottom" constant="8" id="teN-U3-diI"/>
<constraint firstAttribute="centerX" secondItem="GgO-mM-nnz" secondAttribute="centerX" id="zLf-OH-9nF"/>
</constraints>
- <point key="canvasLocation" x="949.5" y="317"/>
+ <point key="canvasLocation" x="949" y="317"/>
</customView>
</objects>
</document>
diff --git a/ui/Base.lproj/RingWindow.xib b/ui/Base.lproj/RingWindow.xib
index c08bc3bd8edcc06dd1e56ce2316f3ece2b2b8289..105e1234a419d019bf8bd19c71b8bea9a7cfd810 100644
--- a/ui/Base.lproj/RingWindow.xib
+++ b/ui/Base.lproj/RingWindow.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="RingWindowController">
@@ -24,37 +24,34 @@
<windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="1053" height="658"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1050"/>
<view key="contentView" autoresizesSubviews="NO" id="se5-gp-TjO">
- <rect key="frame" x="0.0" y="0.0" width="1053" height="736"/>
+ <rect key="frame" x="0.0" y="0.0" width="1053" height="658"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <box horizontalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Pav-Bw-GgK">
- <rect key="frame" x="322" y="0.0" width="5" height="736"/>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
- <font key="titleFont" metaFont="system"/>
+ <box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="Pav-Bw-GgK">
+ <rect key="frame" x="322" y="0.0" width="5" height="658"/>
</box>
<customView wantsLayer="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YgH-CN-tkB" userLabel="Left Panel">
- <rect key="frame" x="0.0" y="0.0" width="324" height="736"/>
+ <rect key="frame" x="0.0" y="0.0" width="324" height="658"/>
<subviews>
<tabView focusRingType="none" drawsBackground="NO" type="noTabsNoBorder" translatesAutoresizingMaskIntoConstraints="NO" id="xXW-iq-GcP">
- <rect key="frame" x="0.0" y="0.0" width="324" height="690"/>
+ <rect key="frame" x="0.0" y="0.0" width="324" height="612"/>
<font key="font" metaFont="system"/>
<tabViewItems>
<tabViewItem label="SmartView" identifier="" id="0MO-4e-8mo">
<view key="view" id="D5P-tm-YgO">
- <rect key="frame" x="0.0" y="0.0" width="324" height="690"/>
+ <rect key="frame" x="0.0" y="0.0" width="324" height="612"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <scrollView focusRingType="none" misplaced="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="omo-Be-zok">
+ <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="omo-Be-zok">
<rect key="frame" x="0.0" y="0.0" width="324" height="609"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="vUu-vJ-ryG">
<rect key="frame" x="0.0" y="0.0" width="324" height="609"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="3NN-k0-vDM" id="tcL-dy-Q3h" customClass="RingOutlineView">
- <rect key="frame" x="0.0" y="0.0" width="324" height="0.0"/>
+ <rect key="frame" x="0.0" y="0.0" width="324" height="609"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="0.0" colorSpace="deviceWhite"/>
@@ -80,6 +77,7 @@
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="epa-Ih-aKF">
<rect key="frame" x="57" y="31" width="225" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Display Role" id="uSw-g5-kte">
<font key="font" size="16" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -96,6 +94,7 @@
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="epi-ZP-as5">
<rect key="frame" x="57" y="10" width="177" height="20"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="details" id="BfK-c5-B1l">
<font key="font" size="13" name="HelveticaNeue-Light"/>
<color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/>
@@ -217,7 +216,6 @@
</connections>
</outlineView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="OkJ-yp-L3b">
<rect key="frame" x="1" y="119" width="223" height="15"/>
@@ -278,6 +276,7 @@
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="9c4-YB-v5K">
<rect key="frame" x="8" y="5" width="304.5" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Category" id="gaf-Za-tuc">
<font key="font" size="16" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -347,7 +346,6 @@
</connections>
</outlineView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="9To-im-dx7">
<rect key="frame" x="1" y="119" width="223" height="15"/>
@@ -379,7 +377,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowHeight="70" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="10" outlineTableColumn="8Ve-L0-o7V" id="Hrg-Fe-uGq" customClass="RingOutlineView">
- <rect key="frame" x="0.0" y="0.0" width="324" height="0.0"/>
+ <rect key="frame" x="0.0" y="0.0" width="324" height="612"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
@@ -471,6 +469,7 @@
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="ILI-pW-VaK">
<rect key="frame" x="7" y="-1" width="304.5" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Category" id="d5o-nL-fRP">
<font key="font" size="16" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -488,6 +487,7 @@
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="Gys-Du-oeQ">
<rect key="frame" x="7" y="1" width="304.5" height="25"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Contact Method" id="FlQ-Th-nfO">
<font key="font" size="14" name="HelveticaNeue-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -511,7 +511,6 @@
</connections>
</outlineView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="TGe-ww-q1j">
<rect key="frame" x="1" y="119" width="223" height="15"/>
@@ -534,7 +533,7 @@
</tabViewItems>
</tabView>
<searchField wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PoQ-x4-ES3">
- <rect key="frame" x="20" y="698" width="258" height="22"/>
+ <rect key="frame" x="20" y="620" width="258" height="22"/>
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Name, ringID" usesSingleLineMode="YES" bezelStyle="round" id="vvE-nM-kSl">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -545,7 +544,7 @@
</connections>
</searchField>
<button verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="j5k-WC-n59" userLabel="Call Button" customClass="IconButton">
- <rect key="frame" x="286" y="694" width="30" height="30"/>
+ <rect key="frame" x="286" y="616" width="30" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="FTa-mZ-R4s"/>
<constraint firstAttribute="width" constant="30" id="HPd-La-IgC"/>
@@ -578,20 +577,20 @@
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Fzg-MB-mlx" userLabel="HomeView">
- <rect key="frame" x="326" y="0.0" width="727" height="736"/>
+ <rect key="frame" x="326" y="0.0" width="727" height="658"/>
<subviews>
<customView focusRingType="none" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tSW-YT-asL">
- <rect key="frame" x="662" y="103" width="727" height="658"/>
+ <rect key="frame" x="662" y="25" width="727" height="658"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="400" id="5yo-rb-X1O"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="725" id="ccX-uq-zuj"/>
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="D6e-KX-8gC">
- <rect key="frame" x="103" y="233" width="520" height="270"/>
+ <rect key="frame" x="103" y="194" width="520" height="270"/>
<subviews>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VJ1-xk-v5e">
- <rect key="frame" x="105" y="83" width="308" height="84"/>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VJ1-xk-v5e">
+ <rect key="frame" x="106" y="83" width="308" height="84"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="eln-Vm-t0d">
<font key="font" size="15" name="HelveticaNeue"/>
<string key="title">Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</string>
@@ -599,8 +598,8 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kFj-Sh-o5u">
- <rect key="frame" x="94" y="56" width="330" height="19"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kFj-Sh-o5u">
+ <rect key="frame" x="18" y="56" width="484" height="19"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="326" id="i1K-ok-BEb"/>
</constraints>
@@ -610,7 +609,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JN3-vO-zcd" userLabel="Ring ID" customClass="RingIDField">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JN3-vO-zcd" userLabel="Ring ID" customClass="RingIDField">
<rect key="frame" x="20" y="22" width="400" height="26"/>
<constraints>
<constraint firstAttribute="height" constant="26" id="TYe-h2-pPT"/>
@@ -622,11 +621,15 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f62-JV-dgr">
- <rect key="frame" x="146" y="175" width="225" height="75"/>
+ <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="f62-JV-dgr">
+ <rect key="frame" x="147" y="175" width="225" height="75"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="75" id="mWM-v0-n2w"/>
+ <constraint firstAttribute="width" constant="225" id="paw-4z-Zbv"/>
+ </constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="symbol_name" id="9ti-Q4-TAv"/>
</imageView>
- <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Oac-o7-2Ge">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="Oac-o7-2Ge">
<rect key="frame" x="470" y="20" width="30" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="AXu-uA-KCC"/>
@@ -640,7 +643,7 @@
<action selector="shareRingID:" target="-2" id="8bY-RW-cQS"/>
</connections>
</button>
- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eXV-BT-B6J" customClass="IconButton">
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="eXV-BT-B6J" customClass="IconButton">
<rect key="frame" x="431" y="20" width="30" height="30"/>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="qrcode" imagePosition="only" alignment="center" transparent="YES" imageScaling="proportionallyUpOrDown" inset="2" id="vvm-Gy-Tbh">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -657,12 +660,26 @@
</button>
</subviews>
<constraints>
+ <constraint firstItem="f62-JV-dgr" firstAttribute="top" secondItem="D6e-KX-8gC" secondAttribute="top" constant="20" id="0b6-u8-yQg"/>
+ <constraint firstItem="eXV-BT-B6J" firstAttribute="leading" secondItem="JN3-vO-zcd" secondAttribute="trailing" constant="11" id="4u6-30-3Ac"/>
+ <constraint firstItem="Oac-o7-2Ge" firstAttribute="centerY" secondItem="JN3-vO-zcd" secondAttribute="centerY" id="9sL-W9-dDT"/>
+ <constraint firstItem="JN3-vO-zcd" firstAttribute="leading" secondItem="D6e-KX-8gC" secondAttribute="leading" constant="20" id="AMV-Tt-nEu"/>
+ <constraint firstItem="VJ1-xk-v5e" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="ID9-YU-lFv"/>
+ <constraint firstAttribute="trailing" secondItem="Oac-o7-2Ge" secondAttribute="trailing" constant="20" id="J2a-v7-JnP"/>
+ <constraint firstItem="eXV-BT-B6J" firstAttribute="centerY" secondItem="JN3-vO-zcd" secondAttribute="centerY" id="KqQ-sn-ZT0"/>
<constraint firstAttribute="height" constant="270" id="PLl-IK-oQA"/>
+ <constraint firstItem="Oac-o7-2Ge" firstAttribute="leading" secondItem="eXV-BT-B6J" secondAttribute="trailing" constant="9" id="TPn-gc-dPs"/>
+ <constraint firstItem="f62-JV-dgr" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="VTp-M2-i33"/>
+ <constraint firstItem="JN3-vO-zcd" firstAttribute="top" secondItem="kFj-Sh-o5u" secondAttribute="bottom" constant="8" id="WCt-uf-zGJ"/>
+ <constraint firstItem="kFj-Sh-o5u" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="X8P-ae-ug3"/>
+ <constraint firstItem="eXV-BT-B6J" firstAttribute="top" secondItem="kFj-Sh-o5u" secondAttribute="bottom" constant="6" id="jfB-b4-Gyc"/>
<constraint firstAttribute="width" constant="520" id="nXn-Wh-VAi"/>
+ <constraint firstItem="kFj-Sh-o5u" firstAttribute="top" secondItem="VJ1-xk-v5e" secondAttribute="bottom" constant="8" id="wQ0-UB-Yo2"/>
+ <constraint firstItem="VJ1-xk-v5e" firstAttribute="top" secondItem="f62-JV-dgr" secondAttribute="bottom" constant="8" id="zNb-f8-m6q"/>
</constraints>
</customView>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dZR-JL-MY4">
- <rect key="frame" x="263" y="268" width="200" height="200"/>
+ <rect key="frame" x="263" y="229" width="200" height="200"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="RCZ-Wt-iKD"/>
<constraint firstAttribute="height" constant="200" id="tSn-OT-Zn8"/>
diff --git a/ui/Base.lproj/VideoPrefs.xib b/ui/Base.lproj/VideoPrefs.xib
index b2b7ff2041499c4ced8893f69ff91ac178a2de95..f5dbccf200d330fe5365c10b0d7411b6009e0e6b 100644
--- a/ui/Base.lproj/VideoPrefs.xib
+++ b/ui/Base.lproj/VideoPrefs.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="VideoPrefsVC">
@@ -19,8 +19,8 @@
<rect key="frame" x="0.0" y="0.0" width="541" height="440"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FRq-3r-0WL">
- <rect key="frame" x="16" y="406" width="66" height="17"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FRq-3r-0WL">
+ <rect key="frame" x="18" y="403" width="66" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="62" id="EZT-vC-kU5"/>
</constraints>
@@ -30,7 +30,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DTo-76-fYS">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DTo-76-fYS">
<rect key="frame" x="18" y="284" width="56" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="52" id="cDW-QA-C8K"/>
@@ -41,14 +41,14 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <customView wantsLayer="YES" canDrawConcurrently="YES" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qAJ-w8-a6Q" userLabel="Preview">
+ <customView wantsLayer="YES" canDrawConcurrently="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qAJ-w8-a6Q" userLabel="Preview">
<rect key="frame" x="32" y="20" width="489" height="256"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="470" id="WVf-8f-i99"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="256" id="cpy-ph-ToC"/>
</constraints>
</customView>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VWx-4c-7aF">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VWx-4c-7aF">
<rect key="frame" x="151" y="380" width="46" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="42" id="oUT-qc-42j"/>
@@ -59,8 +59,11 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5L8-b6-N3k" userLabel="Devices">
+ <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5L8-b6-N3k" userLabel="Devices">
<rect key="frame" x="201" y="375" width="189" height="26"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="184" id="WEa-DR-XtX"/>
+ </constraints>
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="6Vf-hb-26C">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -74,7 +77,7 @@
<action selector="chooseDevice:" target="-2" id="JjJ-Ul-8VM"/>
</connections>
</popUpButton>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cDr-8B-RiJ">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cDr-8B-RiJ">
<rect key="frame" x="167" y="349" width="30" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="26" id="bvy-Cc-671"/>
@@ -85,7 +88,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="60X-MX-gun">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="60X-MX-gun">
<rect key="frame" x="164" y="315" width="33" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="29" id="jrh-Jr-I8X"/>
@@ -96,7 +99,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Aec-P9-KNS" userLabel="Sizes">
+ <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aec-P9-KNS" userLabel="Sizes">
<rect key="frame" x="201" y="344" width="189" height="26"/>
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="6ly-dX-MT4">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -111,7 +114,7 @@
<action selector="chooseSize:" target="-2" id="qra-Ci-Om8"/>
</connections>
</popUpButton>
- <popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e3h-qA-wZ5" userLabel="Rates">
+ <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e3h-qA-wZ5" userLabel="Rates">
<rect key="frame" x="201" y="310" width="189" height="26"/>
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="pDt-c4-Fhs">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -128,16 +131,28 @@
</popUpButton>
</subviews>
<constraints>
+ <constraint firstItem="Aec-P9-KNS" firstAttribute="top" secondItem="5L8-b6-N3k" secondAttribute="bottom" constant="10" symbolic="YES" id="30H-Y4-Vdk"/>
<constraint firstItem="Aec-P9-KNS" firstAttribute="leading" secondItem="e3h-qA-wZ5" secondAttribute="leading" id="BqB-1m-6cO"/>
<constraint firstAttribute="trailing" secondItem="qAJ-w8-a6Q" secondAttribute="trailing" constant="20" id="EIm-N6-noX"/>
<constraint firstItem="DTo-76-fYS" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" id="FJb-iY-SG3"/>
+ <constraint firstItem="FRq-3r-0WL" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="20" id="IHw-9z-VLL"/>
<constraint firstItem="Aec-P9-KNS" firstAttribute="leading" secondItem="5L8-b6-N3k" secondAttribute="leading" id="JRH-eb-BJz"/>
+ <constraint firstItem="5L8-b6-N3k" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="41" id="KEl-KW-FhR"/>
<constraint firstItem="qAJ-w8-a6Q" firstAttribute="top" secondItem="DTo-76-fYS" secondAttribute="bottom" constant="8" id="LbB-2Z-j9c"/>
<constraint firstAttribute="bottom" secondItem="qAJ-w8-a6Q" secondAttribute="bottom" constant="20" id="Sv6-Ls-4tS"/>
<constraint firstItem="Aec-P9-KNS" firstAttribute="leading" secondItem="cDr-8B-RiJ" secondAttribute="trailing" constant="8" id="VXU-iE-bQZ"/>
<constraint firstItem="5L8-b6-N3k" firstAttribute="leading" secondItem="VWx-4c-7aF" secondAttribute="trailing" constant="8" id="XsG-3e-CZ6"/>
+ <constraint firstItem="FRq-3r-0WL" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" id="YLm-bH-x5h"/>
+ <constraint firstItem="5L8-b6-N3k" firstAttribute="trailing" secondItem="Aec-P9-KNS" secondAttribute="trailing" id="YUh-dc-lfW"/>
+ <constraint firstItem="e3h-qA-wZ5" firstAttribute="top" secondItem="Aec-P9-KNS" secondAttribute="bottom" constant="13" id="cK6-VS-WcZ"/>
+ <constraint firstItem="cDr-8B-RiJ" firstAttribute="centerY" secondItem="Aec-P9-KNS" secondAttribute="centerY" id="dMC-00-cGN"/>
+ <constraint firstItem="60X-MX-gun" firstAttribute="centerY" secondItem="e3h-qA-wZ5" secondAttribute="centerY" id="efm-js-U8V"/>
+ <constraint firstItem="5L8-b6-N3k" firstAttribute="centerY" secondItem="VWx-4c-7aF" secondAttribute="centerY" id="gRq-aG-Tev"/>
<constraint firstItem="qAJ-w8-a6Q" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="32" id="gt3-zq-vOi"/>
+ <constraint firstItem="qAJ-w8-a6Q" firstAttribute="top" secondItem="e3h-qA-wZ5" secondAttribute="bottom" constant="37" id="hX1-bK-s7J"/>
+ <constraint firstItem="5L8-b6-N3k" firstAttribute="trailing" secondItem="e3h-qA-wZ5" secondAttribute="trailing" id="jTr-3S-Lag"/>
<constraint firstItem="e3h-qA-wZ5" firstAttribute="leading" secondItem="60X-MX-gun" secondAttribute="trailing" constant="8" id="k6I-Lc-Rfi"/>
+ <constraint firstItem="5L8-b6-N3k" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="203" id="vSx-Zv-fHl"/>
</constraints>
<point key="canvasLocation" x="372.5" y="257"/>
</customView>