accounts: refactor account panel
This commit simplifies the UI to manage (create, remove, backup,
restore) accounts. It includes the rewording of the previous
Import/Export feature to prevent confusion with the new multidevice
export.
Import is now 'Restore account'
Export is now 'Backup account'
Additionnal label have been added as well
Tuleap: #1152
Change-Id: I64506ce8a2d740f33eeb4719efb4bf8e9f2df746
diff --git a/ui/Base.lproj/AccGeneral.xib b/ui/Base.lproj/AccGeneral.xib
index f784799..f13ecf9 100644
--- a/ui/Base.lproj/AccGeneral.xib
+++ b/ui/Base.lproj/AccGeneral.xib
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2553a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
@@ -22,7 +22,7 @@
<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="582" height="380"/>
+ <rect key="frame" x="0.0" y="0.0" width="474" height="380"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0Ej-Lr-p20">
@@ -214,20 +214,6 @@
<action selector="toggleUpnp:" target="-2" id="pl8-QR-BBc"/>
</connections>
</button>
- <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"/>
- </buttonCell>
- <connections>
- <action selector="removeAccount:" target="-2" id="uzp-ub-gsq"/>
- </connections>
- </button>
<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">
@@ -271,7 +257,6 @@
<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"/>
@@ -291,7 +276,6 @@
<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"/>
@@ -308,10 +292,7 @@
<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"/>
+ <point key="canvasLocation" x="-41" y="37"/>
</customView>
</objects>
- <resources>
- <image name="ic_delete" width="72" height="72"/>
- </resources>
</document>
diff --git a/ui/Base.lproj/AccRing.xib b/ui/Base.lproj/AccRing.xib
index d1b294b..cfb0536 100644
--- a/ui/Base.lproj/AccRing.xib
+++ b/ui/Base.lproj/AccRing.xib
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" 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="16B2553a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
@@ -13,7 +13,6 @@
<outlet property="autoAnswerButton" destination="6uh-UC-6i9" id="6e1-1I-OY3"/>
<outlet property="bootstrapField" destination="phb-wW-DQS" id="kcY-7z-bjM"/>
<outlet property="hashField" destination="c6M-WV-uVk" id="Jhb-0k-sBc"/>
- <outlet property="typeLabel" destination="vov-vT-UPq" id="cy7-xb-0xG"/>
<outlet property="upnpButton" destination="eaR-8q-smW" id="8KN-3k-B3c"/>
<outlet property="userAgentButton" destination="e6G-kW-opo" id="HC1-QL-Z0U"/>
<outlet property="userAgentTextField" destination="fJM-4J-mvZ" id="2jX-ak-jgJ"/>
@@ -23,9 +22,53 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="Hz6-mo-xeY">
- <rect key="frame" x="0.0" y="0.0" width="629" height="464"/>
+ <rect key="frame" x="0.0" y="0.0" width="629" height="424"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iSd-2v-I3h">
+ <rect key="frame" x="18" y="387" width="58" 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" translatesAutoresizingMaskIntoConstraints="NO" id="D7f-4A-xXM">
+ <rect key="frame" x="135" y="357" 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"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <outlet property="delegate" destination="-2" id="6da-DY-mtf"/>
+ </connections>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="idQ-yZ-XB3">
+ <rect key="frame" x="95" y="360" 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" translatesAutoresizingMaskIntoConstraints="NO" id="EVi-Oa-N9k">
+ <rect key="frame" x="295" y="361" 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" 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">
@@ -34,7 +77,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4QL-FW-Kjb">
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" 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"/>
@@ -67,17 +110,6 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <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" translatesAutoresizingMaskIntoConstraints="NO" id="phb-wW-DQS">
<rect key="frame" x="156" y="233" width="303" height="22"/>
<constraints>
@@ -145,7 +177,7 @@
<action selector="toggleUpnp:" target="-2" id="Ptl-25-3Xz"/>
</connections>
</button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="c6K-nF-ezL">
+ <button misplaced="YES" 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"/>
@@ -155,7 +187,7 @@
<action selector="toggleAllowFromHistory:" target="-2" id="nl2-H4-ARL"/>
</connections>
</button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="reK-M8-Eie">
+ <button misplaced="YES" 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"/>
@@ -165,7 +197,7 @@
<action selector="toggleAllowFromUnknown:" target="-2" id="St8-jV-rUj"/>
</connections>
</button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="Zpn-KI-Jfm">
+ <button misplaced="YES" 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"/>
@@ -175,58 +207,6 @@
<action selector="toggleAllowFromContacts:" target="-2" id="s1A-th-o6G"/>
</connections>
</button>
- <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"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <outlet property="delegate" destination="-2" id="6da-DY-mtf"/>
- </connections>
- </textField>
- <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"/>
- <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" 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" 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" 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" translatesAutoresizingMaskIntoConstraints="NO" id="c6M-WV-uVk">
<rect key="frame" x="111" y="265" width="407" height="30"/>
<constraints>
@@ -247,20 +227,6 @@
</fragment>
</attributedString>
</textField>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="Ozb-Bq-opJ">
- <rect key="frame" x="579" y="414" width="30" height="30"/>
- <constraints>
- <constraint firstAttribute="width" constant="30" id="1k4-J3-F2v"/>
- <constraint firstAttribute="height" constant="30" id="GrG-YX-xfO"/>
- </constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_delete" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="jda-Gm-dN1">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="removeAccount:" target="-2" id="QAc-I1-OZP"/>
- </connections>
- </button>
</subviews>
<constraints>
<constraint firstItem="Zpn-KI-Jfm" firstAttribute="leading" secondItem="reK-M8-Eie" secondAttribute="leading" id="0aK-Ci-93E"/>
@@ -269,16 +235,10 @@
<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"/>
@@ -287,37 +247,32 @@
<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="iSd-2v-I3h" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" id="jT1-wr-Whu"/>
<constraint firstItem="c6K-nF-ezL" firstAttribute="top" secondItem="reK-M8-Eie" secondAttribute="bottom" constant="13" id="kta-4V-sYw"/>
+ <constraint firstItem="P8b-Ru-H5G" firstAttribute="top" secondItem="idQ-yZ-XB3" secondAttribute="bottom" constant="11" id="mbu-AH-UaM"/>
<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"/>
+ <point key="canvasLocation" x="213.5" y="230"/>
</customView>
<userDefaultsController representsSharedInstance="YES" id="OEq-Ja-Vda"/>
</objects>
- <resources>
- <image name="ic_delete" width="72" height="72"/>
- </resources>
</document>
diff --git a/ui/Base.lproj/Accounts.xib b/ui/Base.lproj/Accounts.xib
index ee7b890..7707007 100644
--- a/ui/Base.lproj/Accounts.xib
+++ b/ui/Base.lproj/Accounts.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="10117" systemVersion="15G31" 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="16B2553a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccountsVC">
@@ -10,10 +10,8 @@
<outlet property="accountsListView" destination="jXv-6I-P9R" id="MzW-0C-PN1"/>
<outlet property="advancedTabItem" destination="RT7-u6-bhe" id="eAT-ce-MyD"/>
<outlet property="configPanels" destination="Jki-s4-F1W" id="nY4-dc-CQg"/>
- <outlet property="exportAccountButton" destination="8zw-sS-2ZT" id="aIw-Go-uB4"/>
<outlet property="generalTabItem" destination="tPR-Ac-N5Y" id="39S-pz-1Xs"/>
<outlet property="mediaTabItem" destination="lxr-my-vH8" id="BhJ-cS-yVi"/>
- <outlet property="protocolList" destination="rZv-qd-BGe" id="yU0-6C-Vt1"/>
<outlet property="ringDevicesTabItem" destination="cT1-A5-rbj" id="Sql-e4-mD8"/>
<outlet property="ringTabItem" destination="1HC-kF-Jun" id="FJZ-2g-Y1i"/>
<outlet property="securityTabItem" destination="Vp5-yV-ScC" id="FDx-0T-3t9"/>
@@ -23,46 +21,46 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="Hz6-mo-xeY">
- <rect key="frame" x="0.0" y="0.0" width="880" height="635"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <rect key="frame" x="0.0" y="0.0" width="880" height="512"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tabView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jki-s4-F1W">
- <rect key="frame" x="271" y="10" width="596" height="611"/>
+ <rect key="frame" x="271" y="10" width="596" height="488"/>
<font key="font" metaFont="system"/>
<tabViewItems>
<tabViewItem label="General" identifier="1" id="tPR-Ac-N5Y">
<view key="view" id="8c3-Js-oxO">
- <rect key="frame" x="10" y="33" width="576" height="565"/>
+ <rect key="frame" x="10" y="33" width="576" height="442"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
</tabViewItem>
<tabViewItem label="Media" identifier="2" id="lxr-my-vH8">
<view key="view" id="p9F-kK-hRx">
- <rect key="frame" x="10" y="33" width="576" height="565"/>
+ <rect key="frame" x="10" y="33" width="576" height="442"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
</tabViewItem>
<tabViewItem label="Advanced" identifier="" id="RT7-u6-bhe">
<view key="view" id="Pp4-JG-r1v">
- <rect key="frame" x="10" y="33" width="576" height="565"/>
+ <rect key="frame" x="10" y="33" width="576" height="442"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
</tabViewItem>
<tabViewItem label="Security" identifier="" id="Vp5-yV-ScC">
<view key="view" id="p3d-5C-tAZ">
- <rect key="frame" x="10" y="33" width="576" height="565"/>
+ <rect key="frame" x="10" y="33" width="576" height="442"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
</tabViewItem>
<tabViewItem label="Ring" identifier="" id="1HC-kF-Jun">
<view key="view" id="asB-J0-2bi">
- <rect key="frame" x="10" y="33" width="576" height="565"/>
+ <rect key="frame" x="10" y="33" width="576" height="442"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
</tabViewItem>
<tabViewItem label="Devices" identifier="" id="cT1-A5-rbj">
<view key="view" id="Ey1-5D-Zou">
- <rect key="frame" x="10" y="33" width="576" height="565"/>
+ <rect key="frame" x="10" y="33" width="576" height="442"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
</tabViewItem>
@@ -72,13 +70,13 @@
</connections>
</tabView>
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="57" horizontalPageScroll="10" verticalLineScroll="57" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZBN-hf-rGe">
- <rect key="frame" x="20" y="115" width="250" height="500"/>
+ <rect key="frame" x="20" y="20" width="250" height="472"/>
<clipView key="contentView" id="f8N-NI-2Mk">
- <rect key="frame" x="0.0" y="0.0" width="250" height="500"/>
+ <rect key="frame" x="0.0" y="0.0" width="250" height="472"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" autosaveColumns="NO" rowHeight="55" rowSizeStyle="automatic" viewBased="YES" outlineTableColumn="eOe-f3-q88" id="jXv-6I-P9R" customClass="RingOutlineView">
- <rect key="frame" x="0.0" y="0.0" width="250" height="0.0"/>
+ <rect key="frame" x="0.0" y="0.0" width="250" height="472"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -165,10 +163,9 @@
</connections>
</outlineView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<constraints>
- <constraint firstAttribute="height" constant="500" id="UBl-FT-gaL"/>
+ <constraint firstAttribute="height" constant="472" id="UBl-FT-gaL"/>
<constraint firstAttribute="width" constant="250" id="aC0-6T-CUo"/>
</constraints>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="x1l-v5-r0B">
@@ -180,97 +177,54 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zWn-Zy-Uau">
- <rect key="frame" x="14" y="54" width="82" height="32"/>
- <constraints>
- <constraint firstAttribute="width" constant="70" id="wC2-dX-oeG"/>
- </constraints>
- <buttonCell key="cell" type="push" bezelStyle="rounded" image="NSAddTemplate" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3we-3L-Sib">
+ <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ob6-rc-0pc">
+ <rect key="frame" x="29" y="30" width="25" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" id="jnk-VG-Do6">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
- <action selector="addAccount:" target="-2" id="P9N-LS-Ikk"/>
+ <action selector="removeAccount:" target="-2" id="nTB-Tc-25y"/>
</connections>
</button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9VL-9a-rDg">
- <rect key="frame" x="18" y="90" width="105" height="17"/>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="41" id="VFE-du-cB1"/>
- </constraints>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Create Account" id="OZ9-qH-dYW">
- <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>
- <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rZv-qd-BGe">
- <rect key="frame" x="96" y="58" width="177" height="26"/>
- <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" identifier="protocolList" imageScaling="proportionallyDown" inset="2" id="bfy-Lh-jXj">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="menu"/>
- <menu key="menu" id="C4E-fX-038">
- <connections>
- <outlet property="delegate" destination="-2" id="J3b-L2-TQ3"/>
- </connections>
- </menu>
- </popUpButtonCell>
- <connections>
- <action selector="protocolSelectedChanged:" target="-2" id="83Y-L0-Bav"/>
- </connections>
- </popUpButton>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="on2-tl-jhF">
- <rect key="frame" x="116" y="13" width="80" height="32"/>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="COM-pP-trH"/>
- <constraint firstAttribute="height" constant="21" id="zSJ-GQ-dyi"/>
- </constraints>
- <buttonCell key="cell" type="push" title="Import" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="zov-Bb-Fgp">
+ <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nRs-ZL-bau">
+ <rect key="frame" x="95" y="30" width="25" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSActionTemplate" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" id="q7p-0B-d1J">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
- <action selector="importAccount:" target="-2" id="0Dl-fT-SY4"/>
+ <action selector="advancedActionsClicked:" target="-2" id="8tJ-gr-g2S"/>
</connections>
</button>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8zw-sS-2ZT">
- <rect key="frame" x="196" y="13" width="80" height="32"/>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="YuZ-Gp-CPP"/>
- <constraint firstAttribute="height" constant="21" id="xKV-h7-UOA"/>
- </constraints>
- <buttonCell key="cell" type="push" title="Export" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="OeK-Sf-pdc">
+ <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vw8-CE-SI3">
+ <rect key="frame" x="62" y="30" width="25" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSAddTemplate" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" id="t1U-xO-AUQ">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
- <action selector="exportAccount:" target="-2" id="AXf-KV-GAn"/>
+ <action selector="addAccountClicked:" target="-2" id="A43-rk-iZv"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="Jki-s4-F1W" secondAttribute="bottom" constant="20" id="C1O-rd-eUI"/>
<constraint firstAttribute="trailing" secondItem="Jki-s4-F1W" secondAttribute="trailing" constant="20" id="J96-3h-sxa"/>
- <constraint firstItem="zWn-Zy-Uau" firstAttribute="top" secondItem="rZv-qd-BGe" secondAttribute="top" id="KqW-8M-1Ad"/>
- <constraint firstItem="zWn-Zy-Uau" firstAttribute="leading" secondItem="9VL-9a-rDg" secondAttribute="leading" id="N5s-qp-4jy"/>
- <constraint firstItem="Jki-s4-F1W" firstAttribute="leading" secondItem="8zw-sS-2ZT" secondAttribute="trailing" constant="8" id="Pc6-IH-cZd"/>
- <constraint firstItem="rZv-qd-BGe" firstAttribute="trailing" secondItem="ZBN-hf-rGe" secondAttribute="trailing" id="UlG-Hv-ZCc"/>
<constraint firstItem="Jki-s4-F1W" firstAttribute="leading" secondItem="ZBN-hf-rGe" secondAttribute="trailing" constant="8" id="Zzg-Tr-BVP"/>
- <constraint firstItem="9VL-9a-rDg" firstAttribute="top" secondItem="ZBN-hf-rGe" secondAttribute="bottom" constant="8" id="dl0-mM-why"/>
<constraint firstItem="Jki-s4-F1W" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" id="fez-KJ-jhG"/>
- <constraint firstItem="rZv-qd-BGe" firstAttribute="top" secondItem="9VL-9a-rDg" secondAttribute="bottom" constant="8" id="ge2-uV-Gff"/>
<constraint firstItem="ZBN-hf-rGe" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" id="jPM-jY-R59"/>
- <constraint firstItem="on2-tl-jhF" firstAttribute="top" secondItem="rZv-qd-BGe" secondAttribute="bottom" constant="20" id="lRd-oa-cDr"/>
- <constraint firstItem="zWn-Zy-Uau" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="lRr-SS-K5h"/>
- <constraint firstItem="8zw-sS-2ZT" firstAttribute="top" secondItem="rZv-qd-BGe" secondAttribute="bottom" constant="20" id="rVH-wD-IKs"/>
- <constraint firstItem="8zw-sS-2ZT" firstAttribute="leading" secondItem="on2-tl-jhF" secondAttribute="trailing" constant="12" id="sDm-KA-PB0"/>
<constraint firstItem="ZBN-hf-rGe" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="u8B-Kk-OHn"/>
- <constraint firstItem="rZv-qd-BGe" firstAttribute="leading" secondItem="zWn-Zy-Uau" secondAttribute="trailing" constant="8" id="y2z-JO-Y63"/>
</constraints>
- <point key="canvasLocation" x="542" y="273.5"/>
+ <point key="canvasLocation" x="542" y="212"/>
</customView>
</objects>
<resources>
+ <image name="NSActionTemplate" width="14" height="14"/>
<image name="NSAddTemplate" width="11" height="11"/>
+ <image name="NSRemoveTemplate" width="11" height="11"/>
</resources>
</document>
diff --git a/ui/Base.lproj/BackupAccountWindow.xib b/ui/Base.lproj/BackupAccountWindow.xib
new file mode 100644
index 0000000..ab6949d
--- /dev/null
+++ b/ui/Base.lproj/BackupAccountWindow.xib
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2553a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+ <dependencies>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="BackupAccountWC">
+ <connections>
+ <outlet property="errorContainer" destination="ty1-sj-tT6" id="eEy-Cr-yiw"/>
+ <outlet property="finalContainer" destination="XMQ-jJ-yqG" id="tI5-N3-LpJ"/>
+ <outlet property="initialContainer" destination="xUT-yB-g8Q" id="nwe-zs-Gxs"/>
+ <outlet property="passwordConfirmationField" destination="Y7v-fZ-BaG" id="Hml-Mx-lM3"/>
+ <outlet property="passwordField" destination="vej-Z8-dOm" id="Ff0-Rb-Al6"/>
+ <outlet property="path" destination="ww6-ha-GhI" id="gdx-sh-x5J"/>
+ <outlet property="progressContainer" destination="3Jv-gr-8Hf" id="S5k-hc-NeK"/>
+ <outlet property="progressIndicator" destination="Ovf-4O-7LZ" id="mq3-1b-ts5"/>
+ <outlet property="window" destination="QvC-M9-y7g" id="bos-rN-Jgz"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="196" y="240" width="380" height="205"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
+ <view key="contentView" id="EiT-Mj-1SZ">
+ <rect key="frame" x="0.0" y="0.0" width="380" height="205"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="XMQ-jJ-yqG">
+ <rect key="frame" x="0.0" y="0.0" width="380" height="205"/>
+ </customView>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="3Jv-gr-8Hf">
+ <rect key="frame" x="0.0" y="0.0" width="380" height="205"/>
+ <subviews>
+ <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ovf-4O-7LZ" customClass="ITProgressIndicator">
+ <rect key="frame" x="155" y="68" width="70" height="70"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="70" id="aK6-EW-mJE"/>
+ <constraint firstAttribute="height" constant="70" id="xfx-Hb-kNz"/>
+ </constraints>
+ </customView>
+ </subviews>
+ <constraints>
+ <constraint firstItem="Ovf-4O-7LZ" firstAttribute="centerX" secondItem="3Jv-gr-8Hf" secondAttribute="centerX" id="Zyc-7w-gXf"/>
+ <constraint firstItem="Ovf-4O-7LZ" firstAttribute="centerY" secondItem="3Jv-gr-8Hf" secondAttribute="centerY" id="dyd-7a-HdM"/>
+ </constraints>
+ </customView>
+ <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ty1-sj-tT6">
+ <rect key="frame" x="0.0" y="0.0" width="380" height="205"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="G1N-th-ZtP">
+ <rect key="frame" x="33" y="94" width="314" height="17"/>
+ <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="An error occured during the backup" placeholderString="" id="e7n-Ev-bK7">
+ <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 verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cxh-K7-1eh">
+ <rect key="frame" x="307" y="7" width="59" height="32"/>
+ <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="VN1-A3-RIh">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="cancelPressed:" target="-2" id="JTp-N4-Tb8"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="G1N-th-ZtP" firstAttribute="centerY" secondItem="ty1-sj-tT6" secondAttribute="centerY" id="79X-Dp-UYW"/>
+ <constraint firstAttribute="trailing" secondItem="cxh-K7-1eh" secondAttribute="trailing" constant="20" id="A86-gB-c3r"/>
+ <constraint firstItem="G1N-th-ZtP" firstAttribute="leading" secondItem="ty1-sj-tT6" secondAttribute="leading" constant="35" id="ajk-sQ-i5v"/>
+ <constraint firstAttribute="trailing" secondItem="G1N-th-ZtP" secondAttribute="trailing" constant="35" id="gLq-cd-XYE"/>
+ <constraint firstAttribute="bottom" secondItem="cxh-K7-1eh" secondAttribute="bottom" constant="20" id="hbG-Vx-wI4"/>
+ <constraint firstItem="G1N-th-ZtP" firstAttribute="centerX" secondItem="ty1-sj-tT6" secondAttribute="centerX" id="xuc-bw-qUg"/>
+ </constraints>
+ </customView>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="xUT-yB-g8Q">
+ <rect key="frame" x="0.0" y="0.0" width="380" height="205"/>
+ <subviews>
+ <pathControl verticalHuggingPriority="750" misplaced="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ww6-ha-GhI">
+ <rect key="frame" x="96" y="110" width="250" height="26"/>
+ <pathCell key="cell" selectable="YES" editable="YES" alignment="left" pathStyle="popUp" id="S8N-6a-Pll">
+ <font key="font" metaFont="system"/>
+ <url key="url" string="file:///Users/"/>
+ </pathCell>
+ </pathControl>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vl7-sD-OLk">
+ <rect key="frame" x="49" y="116" width="44" height="17"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Where" id="9h8-GU-av4">
+ <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>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bcr-Pl-Fz9">
+ <rect key="frame" x="30" y="87" width="63" height="17"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password" id="vwh-K9-3O9">
+ <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>
+ <secureTextField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vej-Z8-dOm">
+ <rect key="frame" x="99" y="84" width="244" height="22"/>
+ <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Password..." usesSingleLineMode="YES" bezelStyle="round" id="xqz-Uz-hqU">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <allowedInputSourceLocales>
+ <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+ </allowedInputSourceLocales>
+ </secureTextFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.password" id="5cX-yS-4Sl">
+ <dictionary key="options">
+ <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+ <string key="NSMultipleValuesPlaceholder">Password...</string>
+ <string key="NSNoSelectionPlaceholder">Password...</string>
+ <string key="NSNotApplicablePlaceholder">Password...</string>
+ <string key="NSNullPlaceholder">Password...</string>
+ </dictionary>
+ </binding>
+ <outlet property="delegate" destination="-2" id="UEj-AI-SPU"/>
+ <outlet property="nextKeyView" destination="Y7v-fZ-BaG" id="RpK-sy-SnU"/>
+ </connections>
+ </secureTextField>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CR7-hP-0ow">
+ <rect key="frame" x="18" y="142" width="344" height="43"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="45" id="Nxf-vc-UNz"/>
+ </constraints>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Choose where to backup your account. It needs to be password protected." placeholderString="" id="KYZ-TW-44Y">
+ <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>
+ <secureTextField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y7v-fZ-BaG" userLabel="Password confirm">
+ <rect key="frame" x="99" y="54" width="244" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Confirm..." usesSingleLineMode="YES" bezelStyle="round" id="5Qf-em-tN4">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <allowedInputSourceLocales>
+ <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+ </allowedInputSourceLocales>
+ </secureTextFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.passwordConfirmation" id="ccf-Bx-Qq8">
+ <dictionary key="options">
+ <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+ <string key="NSMultipleValuesPlaceholder">Password...</string>
+ <string key="NSNoSelectionPlaceholder">Password...</string>
+ <string key="NSNotApplicablePlaceholder">Password...</string>
+ <string key="NSNullPlaceholder">Password...</string>
+ </dictionary>
+ </binding>
+ <outlet property="delegate" destination="-2" id="PVz-Gc-4db"/>
+ </connections>
+ </secureTextField>
+ <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oXB-Be-LaB">
+ <rect key="frame" x="307" y="6" width="59" height="32"/>
+ <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="rW5-Il-5YD">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="completeAction:" target="-2" id="4me-jZ-4mk"/>
+ <binding destination="-2" name="enabled" keyPath="self.validatePasswords" id="OMW-4G-Mzd"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Yf1-T3-fOf">
+ <rect key="frame" x="225" y="6" width="82" height="32"/>
+ <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cSU-aD-OwX">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="cancelPressed:" target="-2" id="bIl-jp-gRS"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="ww6-ha-GhI" firstAttribute="leading" secondItem="vl7-sD-OLk" secondAttribute="trailing" constant="8" id="0AQ-RP-E0C"/>
+ <constraint firstItem="Bcr-Pl-Fz9" firstAttribute="top" secondItem="vl7-sD-OLk" secondAttribute="bottom" constant="12" id="252-O3-ry5"/>
+ <constraint firstItem="CR7-hP-0ow" firstAttribute="top" secondItem="xUT-yB-g8Q" secondAttribute="top" constant="20" id="Gar-kL-wdU"/>
+ <constraint firstItem="vl7-sD-OLk" firstAttribute="leading" secondItem="xUT-yB-g8Q" secondAttribute="leading" constant="51" id="Pu0-r6-jqQ"/>
+ <constraint firstItem="ww6-ha-GhI" firstAttribute="top" secondItem="CR7-hP-0ow" secondAttribute="bottom" constant="7" id="QID-En-G8Q"/>
+ <constraint firstItem="vl7-sD-OLk" firstAttribute="top" secondItem="CR7-hP-0ow" secondAttribute="bottom" constant="8" id="R2q-Tq-1Wj"/>
+ <constraint firstItem="oXB-Be-LaB" firstAttribute="leading" secondItem="Yf1-T3-fOf" secondAttribute="trailing" constant="12" id="Tsc-ay-3Q9"/>
+ <constraint firstAttribute="trailing" secondItem="oXB-Be-LaB" secondAttribute="trailing" constant="20" id="aTI-SX-1jI"/>
+ <constraint firstItem="CR7-hP-0ow" firstAttribute="leading" secondItem="xUT-yB-g8Q" secondAttribute="leading" constant="20" id="at8-jS-cPG"/>
+ <constraint firstItem="vej-Z8-dOm" firstAttribute="top" secondItem="ww6-ha-GhI" secondAttribute="bottom" constant="8" id="hos-bk-6ym"/>
+ <constraint firstAttribute="trailing" secondItem="ww6-ha-GhI" secondAttribute="trailing" constant="37" id="jfu-vK-fXY"/>
+ <constraint firstAttribute="trailing" secondItem="CR7-hP-0ow" secondAttribute="trailing" constant="20" id="lu3-Jz-6TR"/>
+ <constraint firstAttribute="bottom" secondItem="Yf1-T3-fOf" secondAttribute="bottom" constant="20" id="oCq-S8-TrF"/>
+ <constraint firstAttribute="bottom" secondItem="oXB-Be-LaB" secondAttribute="bottom" constant="20" id="ueM-rT-B60"/>
+ </constraints>
+ </customView>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="bottom" secondItem="xUT-yB-g8Q" secondAttribute="bottom" id="A5g-UN-Q8Y"/>
+ <constraint firstAttribute="trailing" secondItem="3Jv-gr-8Hf" secondAttribute="trailing" id="JJw-qT-SLD"/>
+ <constraint firstItem="3Jv-gr-8Hf" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="LCu-zR-e4t"/>
+ <constraint firstAttribute="trailing" secondItem="XMQ-jJ-yqG" secondAttribute="trailing" id="MO0-ux-B0L"/>
+ <constraint firstItem="3Jv-gr-8Hf" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="UYR-BR-G4e"/>
+ <constraint firstItem="xUT-yB-g8Q" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="XBA-9P-42v"/>
+ <constraint firstItem="ty1-sj-tT6" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="Z2j-Op-xGA"/>
+ <constraint firstItem="XMQ-jJ-yqG" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="aCe-zN-exF"/>
+ <constraint firstItem="ty1-sj-tT6" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="c0W-lm-q02"/>
+ <constraint firstAttribute="bottom" secondItem="XMQ-jJ-yqG" secondAttribute="bottom" id="dmX-rf-f4v"/>
+ <constraint firstAttribute="bottom" secondItem="3Jv-gr-8Hf" secondAttribute="bottom" id="jr4-Qd-mQ6"/>
+ <constraint firstAttribute="trailing" secondItem="ty1-sj-tT6" secondAttribute="trailing" id="lX9-qw-YEb"/>
+ <constraint firstAttribute="trailing" secondItem="xUT-yB-g8Q" secondAttribute="trailing" id="mrt-5Y-23Y"/>
+ <constraint firstItem="XMQ-jJ-yqG" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="tud-fv-p9U"/>
+ <constraint firstAttribute="bottom" secondItem="ty1-sj-tT6" secondAttribute="bottom" id="vsJ-eW-ogF"/>
+ <constraint firstItem="xUT-yB-g8Q" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="zTw-Zm-V44"/>
+ </constraints>
+ </view>
+ <connections>
+ <outlet property="delegate" destination="-2" id="3wn-SC-48D"/>
+ <outlet property="initialFirstResponder" destination="xUT-yB-g8Q" id="WGS-1O-JBF"/>
+ </connections>
+ <point key="canvasLocation" x="-439" y="15.5"/>
+ </window>
+ </objects>
+</document>
diff --git a/ui/Base.lproj/PathPasswordWindow.xib b/ui/Base.lproj/PathPasswordWindow.xib
deleted file mode 100644
index 431d8a7..0000000
--- a/ui/Base.lproj/PathPasswordWindow.xib
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
- <dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
- <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
- </dependencies>
- <objects>
- <customObject id="-2" userLabel="File's Owner" customClass="PathPasswordWC">
- <connections>
- <outlet property="errorContainer" destination="ty1-sj-tT6" id="eEy-Cr-yiw"/>
- <outlet property="errorField" destination="G1N-th-ZtP" id="tha-8j-8jR"/>
- <outlet property="finalContainer" destination="XMQ-jJ-yqG" id="tI5-N3-LpJ"/>
- <outlet property="initialContainer" destination="xUT-yB-g8Q" id="nwe-zs-Gxs"/>
- <outlet property="passwordField" destination="vej-Z8-dOm" id="Ff0-Rb-Al6"/>
- <outlet property="path" destination="ww6-ha-GhI" id="gdx-sh-x5J"/>
- <outlet property="progressContainer" destination="3Jv-gr-8Hf" id="S5k-hc-NeK"/>
- <outlet property="progressIndicator" destination="Ovf-4O-7LZ" id="mq3-1b-ts5"/>
- <outlet property="window" destination="QvC-M9-y7g" id="bos-rN-Jgz"/>
- </connections>
- </customObject>
- <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
- <customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
- <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
- <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
- <rect key="contentRect" x="196" y="240" width="351" height="131"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
- <view key="contentView" id="EiT-Mj-1SZ">
- <rect key="frame" x="0.0" y="0.0" width="351" height="131"/>
- <autoresizingMask key="autoresizingMask"/>
- <subviews>
- <customView translatesAutoresizingMaskIntoConstraints="NO" id="3Jv-gr-8Hf">
- <rect key="frame" x="15" y="15" width="321" height="106"/>
- <subviews>
- <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ovf-4O-7LZ" customClass="ITProgressIndicator">
- <rect key="frame" x="125" y="18" width="70" height="70"/>
- <constraints>
- <constraint firstAttribute="width" secondItem="Ovf-4O-7LZ" secondAttribute="height" multiplier="1:1" id="NK5-73-b6c"/>
- </constraints>
- </customView>
- </subviews>
- <constraints>
- <constraint firstItem="Ovf-4O-7LZ" firstAttribute="centerX" secondItem="3Jv-gr-8Hf" secondAttribute="centerX" id="Zyc-7w-gXf"/>
- <constraint firstItem="Ovf-4O-7LZ" firstAttribute="centerY" secondItem="3Jv-gr-8Hf" secondAttribute="centerY" id="dyd-7a-HdM"/>
- <constraint firstItem="Ovf-4O-7LZ" firstAttribute="top" secondItem="3Jv-gr-8Hf" secondAttribute="top" constant="18" id="lKK-Xi-PVF"/>
- </constraints>
- </customView>
- <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XMQ-jJ-yqG">
- <rect key="frame" x="15" y="12" width="321" height="106"/>
- </customView>
- <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xUT-yB-g8Q">
- <rect key="frame" x="1" y="0.0" width="350" height="131"/>
- <subviews>
- <pathControl verticalHuggingPriority="750" fixedFrame="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ww6-ha-GhI">
- <rect key="frame" x="84" y="87" width="250" height="26"/>
- <pathCell key="cell" selectable="YES" editable="YES" alignment="left" pathStyle="popUp" id="S8N-6a-Pll">
- <font key="font" metaFont="system"/>
- <url key="url" string="file:///Users/"/>
- </pathCell>
- </pathControl>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vl7-sD-OLk">
- <rect key="frame" x="37" y="93" width="44" height="17"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Where" id="9h8-GU-av4">
- <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>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bcr-Pl-Fz9">
- <rect key="frame" x="18" y="57" width="63" height="17"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password" id="vwh-K9-3O9">
- <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>
- <secureTextField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vej-Z8-dOm">
- <rect key="frame" x="87" y="54" width="244" height="22"/>
- <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Password..." drawsBackground="YES" usesSingleLineMode="YES" id="xqz-Uz-hqU">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- <allowedInputSourceLocales>
- <string>NSAllRomanInputSourcesLocaleIdentifier</string>
- </allowedInputSourceLocales>
- </secureTextFieldCell>
- <connections>
- <binding destination="-2" name="value" keyPath="self.password" id="5cX-yS-4Sl">
- <dictionary key="options">
- <bool key="NSContinuouslyUpdatesValue" value="YES"/>
- <string key="NSMultipleValuesPlaceholder">Password...</string>
- <string key="NSNoSelectionPlaceholder">Password...</string>
- <string key="NSNotApplicablePlaceholder">Password...</string>
- <string key="NSNullPlaceholder">Password...</string>
- </dictionary>
- </binding>
- <outlet property="delegate" destination="-2" id="UEj-AI-SPU"/>
- </connections>
- </secureTextField>
- <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Yf1-T3-fOf">
- <rect key="frame" x="196" y="13" width="82" height="32"/>
- <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cSU-aD-OwX">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- <string key="keyEquivalent" base64-UTF8="YES">
-Gw
-</string>
- </buttonCell>
- <connections>
- <action selector="cancelPressed:" target="-2" id="bIl-jp-gRS"/>
- </connections>
- </button>
- <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oXB-Be-LaB">
- <rect key="frame" x="278" y="13" width="59" height="32"/>
- <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="rW5-Il-5YD">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- <string key="keyEquivalent" base64-UTF8="YES">
-DQ
-</string>
- </buttonCell>
- <connections>
- <action selector="completeAction:" target="-2" id="4me-jZ-4mk"/>
- <binding destination="-2" name="enabled" keyPath="self.password.length" id="KN4-nF-wwM"/>
- </connections>
- </button>
- </subviews>
- </customView>
- <customView hidden="YES" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ty1-sj-tT6">
- <rect key="frame" x="0.0" y="0.0" width="350" height="131"/>
- <subviews>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="G1N-th-ZtP">
- <rect key="frame" x="18" y="57" width="314" height="17"/>
- <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" placeholderString="error label" id="e7n-Ev-bK7">
- <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 verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cxh-K7-1eh">
- <rect key="frame" x="279" y="13" width="59" height="32"/>
- <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="VN1-A3-RIh">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- <string key="keyEquivalent" base64-UTF8="YES">
-DQ
-</string>
- </buttonCell>
- <connections>
- <action selector="cancelPressed:" target="-2" id="JTp-N4-Tb8"/>
- </connections>
- </button>
- </subviews>
- </customView>
- </subviews>
- <constraints>
- <constraint firstAttribute="trailing" secondItem="3Jv-gr-8Hf" secondAttribute="trailing" constant="15" id="JJw-qT-SLD"/>
- <constraint firstItem="3Jv-gr-8Hf" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="15" id="LCu-zR-e4t"/>
- <constraint firstItem="3Jv-gr-8Hf" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="10" id="UYR-BR-G4e"/>
- <constraint firstAttribute="bottom" secondItem="3Jv-gr-8Hf" secondAttribute="bottom" constant="15" id="jr4-Qd-mQ6"/>
- </constraints>
- </view>
- <connections>
- <outlet property="delegate" destination="-2" id="3wn-SC-48D"/>
- <outlet property="initialFirstResponder" destination="xUT-yB-g8Q" id="WGS-1O-JBF"/>
- </connections>
- <point key="canvasLocation" x="-363.5" y="-97.5"/>
- </window>
- <userDefaultsController representsSharedInstance="YES" id="2A5-Q9-edp"/>
- </objects>
-</document>
diff --git a/ui/Base.lproj/RestoreAccountWindow.xib b/ui/Base.lproj/RestoreAccountWindow.xib
new file mode 100644
index 0000000..6079a16
--- /dev/null
+++ b/ui/Base.lproj/RestoreAccountWindow.xib
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2553a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+ <dependencies>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="RestoreAccountWC">
+ <connections>
+ <outlet property="errorContainer" destination="ty1-sj-tT6" id="eEy-Cr-yiw"/>
+ <outlet property="finalContainer" destination="XMQ-jJ-yqG" id="tI5-N3-LpJ"/>
+ <outlet property="initialContainer" destination="xUT-yB-g8Q" id="nwe-zs-Gxs"/>
+ <outlet property="passwordField" destination="vej-Z8-dOm" id="Ff0-Rb-Al6"/>
+ <outlet property="path" destination="ww6-ha-GhI" id="gdx-sh-x5J"/>
+ <outlet property="progressContainer" destination="3Jv-gr-8Hf" id="S5k-hc-NeK"/>
+ <outlet property="progressIndicator" destination="Ovf-4O-7LZ" id="mq3-1b-ts5"/>
+ <outlet property="window" destination="QvC-M9-y7g" id="bos-rN-Jgz"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="196" y="240" width="380" height="181"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
+ <view key="contentView" id="EiT-Mj-1SZ">
+ <rect key="frame" x="0.0" y="0.0" width="380" height="181"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="XMQ-jJ-yqG">
+ <rect key="frame" x="0.0" y="0.0" width="380" height="181"/>
+ </customView>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="3Jv-gr-8Hf">
+ <rect key="frame" x="0.0" y="0.0" width="380" height="181"/>
+ <subviews>
+ <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ovf-4O-7LZ" customClass="ITProgressIndicator">
+ <rect key="frame" x="155" y="56" width="70" height="70"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="70" id="aK6-EW-mJE"/>
+ <constraint firstAttribute="height" constant="70" id="xfx-Hb-kNz"/>
+ </constraints>
+ </customView>
+ </subviews>
+ <constraints>
+ <constraint firstItem="Ovf-4O-7LZ" firstAttribute="centerX" secondItem="3Jv-gr-8Hf" secondAttribute="centerX" id="Zyc-7w-gXf"/>
+ <constraint firstItem="Ovf-4O-7LZ" firstAttribute="centerY" secondItem="3Jv-gr-8Hf" secondAttribute="centerY" id="dyd-7a-HdM"/>
+ </constraints>
+ </customView>
+ <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ty1-sj-tT6">
+ <rect key="frame" x="0.0" y="0.0" width="380" height="181"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="G1N-th-ZtP">
+ <rect key="frame" x="33" y="82" width="314" height="17"/>
+ <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="An error occured during the restoration" placeholderString="" id="e7n-Ev-bK7">
+ <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 verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cxh-K7-1eh">
+ <rect key="frame" x="307" y="13" width="59" height="32"/>
+ <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="VN1-A3-RIh">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="cancelPressed:" target="-2" id="JTp-N4-Tb8"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="G1N-th-ZtP" firstAttribute="centerY" secondItem="ty1-sj-tT6" secondAttribute="centerY" id="79X-Dp-UYW"/>
+ <constraint firstAttribute="trailing" secondItem="cxh-K7-1eh" secondAttribute="trailing" constant="20" id="A86-gB-c3r"/>
+ <constraint firstItem="G1N-th-ZtP" firstAttribute="leading" secondItem="ty1-sj-tT6" secondAttribute="leading" constant="35" id="ajk-sQ-i5v"/>
+ <constraint firstAttribute="trailing" secondItem="G1N-th-ZtP" secondAttribute="trailing" constant="35" id="gLq-cd-XYE"/>
+ <constraint firstAttribute="bottom" secondItem="cxh-K7-1eh" secondAttribute="bottom" constant="20" id="hbG-Vx-wI4"/>
+ <constraint firstItem="G1N-th-ZtP" firstAttribute="centerX" secondItem="ty1-sj-tT6" secondAttribute="centerX" id="xuc-bw-qUg"/>
+ </constraints>
+ </customView>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="xUT-yB-g8Q">
+ <rect key="frame" x="0.0" y="0.0" width="380" height="181"/>
+ <subviews>
+ <pathControl verticalHuggingPriority="750" misplaced="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ww6-ha-GhI">
+ <rect key="frame" x="96" y="86" width="250" height="26"/>
+ <pathCell key="cell" selectable="YES" editable="YES" alignment="left" pathStyle="popUp" id="S8N-6a-Pll">
+ <font key="font" metaFont="system"/>
+ <url key="url" string="file:///Users/"/>
+ </pathCell>
+ </pathControl>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vl7-sD-OLk">
+ <rect key="frame" x="49" y="92" width="44" height="17"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Where" id="9h8-GU-av4">
+ <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>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bcr-Pl-Fz9">
+ <rect key="frame" x="30" y="63" width="63" height="17"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password" id="vwh-K9-3O9">
+ <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>
+ <secureTextField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vej-Z8-dOm">
+ <rect key="frame" x="99" y="60" width="244" height="22"/>
+ <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Password..." usesSingleLineMode="YES" bezelStyle="round" id="xqz-Uz-hqU">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <allowedInputSourceLocales>
+ <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+ </allowedInputSourceLocales>
+ </secureTextFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.password" id="5cX-yS-4Sl">
+ <dictionary key="options">
+ <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+ <string key="NSMultipleValuesPlaceholder">Password...</string>
+ <string key="NSNoSelectionPlaceholder">Password...</string>
+ <string key="NSNotApplicablePlaceholder">Password...</string>
+ <string key="NSNullPlaceholder">Password...</string>
+ </dictionary>
+ </binding>
+ <outlet property="delegate" destination="-2" id="UEj-AI-SPU"/>
+ </connections>
+ </secureTextField>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CR7-hP-0ow">
+ <rect key="frame" x="18" y="118" width="344" height="43"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="45" id="Nxf-vc-UNz"/>
+ </constraints>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Restore a local copy of your account. You need to enter the password you used to secure this archive." placeholderString="" id="KYZ-TW-44Y">
+ <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 verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oXB-Be-LaB">
+ <rect key="frame" x="307" y="13" width="59" height="32"/>
+ <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="rW5-Il-5YD">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="completeAction:" target="-2" id="4me-jZ-4mk"/>
+ <binding destination="-2" name="enabled" keyPath="self.password.length" id="KN4-nF-wwM"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Yf1-T3-fOf">
+ <rect key="frame" x="225" y="13" width="82" height="32"/>
+ <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cSU-aD-OwX">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="cancelPressed:" target="-2" id="bIl-jp-gRS"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="Bcr-Pl-Fz9" firstAttribute="top" secondItem="vl7-sD-OLk" secondAttribute="bottom" constant="12" id="252-O3-ry5"/>
+ <constraint firstItem="ww6-ha-GhI" firstAttribute="leading" secondItem="vl7-sD-OLk" secondAttribute="trailing" constant="8" id="GHi-l9-glQ"/>
+ <constraint firstItem="CR7-hP-0ow" firstAttribute="top" secondItem="xUT-yB-g8Q" secondAttribute="top" constant="20" id="Gar-kL-wdU"/>
+ <constraint firstItem="ww6-ha-GhI" firstAttribute="top" secondItem="CR7-hP-0ow" secondAttribute="bottom" constant="7" id="QID-En-G8Q"/>
+ <constraint firstAttribute="trailing" secondItem="ww6-ha-GhI" secondAttribute="trailing" constant="37" id="Qdi-Ik-X9E"/>
+ <constraint firstItem="vl7-sD-OLk" firstAttribute="top" secondItem="CR7-hP-0ow" secondAttribute="bottom" constant="8" id="R2q-Tq-1Wj"/>
+ <constraint firstItem="vl7-sD-OLk" firstAttribute="leading" secondItem="xUT-yB-g8Q" secondAttribute="leading" constant="51" id="TWP-Zm-Rqe"/>
+ <constraint firstItem="oXB-Be-LaB" firstAttribute="leading" secondItem="Yf1-T3-fOf" secondAttribute="trailing" constant="12" id="Tsc-ay-3Q9"/>
+ <constraint firstAttribute="trailing" secondItem="oXB-Be-LaB" secondAttribute="trailing" constant="20" id="aTI-SX-1jI"/>
+ <constraint firstItem="CR7-hP-0ow" firstAttribute="leading" secondItem="xUT-yB-g8Q" secondAttribute="leading" constant="20" id="at8-jS-cPG"/>
+ <constraint firstItem="vej-Z8-dOm" firstAttribute="top" secondItem="ww6-ha-GhI" secondAttribute="bottom" constant="8" id="hos-bk-6ym"/>
+ <constraint firstAttribute="trailing" secondItem="CR7-hP-0ow" secondAttribute="trailing" constant="20" id="lu3-Jz-6TR"/>
+ <constraint firstAttribute="bottom" secondItem="Yf1-T3-fOf" secondAttribute="bottom" constant="20" id="oCq-S8-TrF"/>
+ <constraint firstAttribute="bottom" secondItem="oXB-Be-LaB" secondAttribute="bottom" constant="20" id="ueM-rT-B60"/>
+ </constraints>
+ </customView>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="bottom" secondItem="xUT-yB-g8Q" secondAttribute="bottom" id="A5g-UN-Q8Y"/>
+ <constraint firstAttribute="trailing" secondItem="3Jv-gr-8Hf" secondAttribute="trailing" id="JJw-qT-SLD"/>
+ <constraint firstItem="3Jv-gr-8Hf" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="LCu-zR-e4t"/>
+ <constraint firstAttribute="trailing" secondItem="XMQ-jJ-yqG" secondAttribute="trailing" id="MO0-ux-B0L"/>
+ <constraint firstItem="3Jv-gr-8Hf" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="UYR-BR-G4e"/>
+ <constraint firstItem="xUT-yB-g8Q" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="XBA-9P-42v"/>
+ <constraint firstItem="ty1-sj-tT6" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="Z2j-Op-xGA"/>
+ <constraint firstItem="XMQ-jJ-yqG" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="aCe-zN-exF"/>
+ <constraint firstItem="ty1-sj-tT6" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="c0W-lm-q02"/>
+ <constraint firstAttribute="bottom" secondItem="XMQ-jJ-yqG" secondAttribute="bottom" id="dmX-rf-f4v"/>
+ <constraint firstAttribute="bottom" secondItem="3Jv-gr-8Hf" secondAttribute="bottom" id="jr4-Qd-mQ6"/>
+ <constraint firstAttribute="trailing" secondItem="ty1-sj-tT6" secondAttribute="trailing" id="lX9-qw-YEb"/>
+ <constraint firstAttribute="trailing" secondItem="xUT-yB-g8Q" secondAttribute="trailing" id="mrt-5Y-23Y"/>
+ <constraint firstItem="XMQ-jJ-yqG" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="tud-fv-p9U"/>
+ <constraint firstAttribute="bottom" secondItem="ty1-sj-tT6" secondAttribute="bottom" id="vsJ-eW-ogF"/>
+ <constraint firstItem="xUT-yB-g8Q" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="zTw-Zm-V44"/>
+ </constraints>
+ </view>
+ <connections>
+ <outlet property="delegate" destination="-2" id="3wn-SC-48D"/>
+ <outlet property="initialFirstResponder" destination="xUT-yB-g8Q" id="WGS-1O-JBF"/>
+ </connections>
+ <point key="canvasLocation" x="-439" y="3.5"/>
+ </window>
+ </objects>
+</document>