pathpasswordvc: refactoring/extract superclass
This patch extracts superclass and protocols from PathPasswordVC.
Allowing to reuse code for futur components needed by futur releases
like AddingDevices.
Change-Id: I9cc8c88489f14841e5c8f36cc2fa2eb9d967b1b0
Tuleap: #959
diff --git a/ui/Base.lproj/PathPasswordWindow.xib b/ui/Base.lproj/PathPasswordWindow.xib
index e7aa971..4fd608a 100644
--- a/ui/Base.lproj/PathPasswordWindow.xib
+++ b/ui/Base.lproj/PathPasswordWindow.xib
@@ -1,17 +1,20 @@
<?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="10117" systemVersion="15G31" 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="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="errorLabel" destination="G1N-th-ZtP" id="PMs-b1-oJo"/>
+ <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="pathPasswordContainer" destination="xUT-yB-g8Q" id="xyd-vF-fD8"/>
- <outlet property="progressView" destination="Ovf-4O-7LZ" id="BgC-sc-6GS"/>
+ <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>
@@ -21,13 +24,29 @@
<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="1680" height="1050"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<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 hidden="YES" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ovf-4O-7LZ" customClass="ITProgressIndicator">
- <rect key="frame" x="140" y="30" width="70" height="70"/>
+ <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"/>
@@ -134,9 +153,16 @@
</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>