OS X:

Fiddling with XIB constraints.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88251 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 25 insertions, 26 deletions

diff --git a/macosx/plugins/DFNet/Base.lproj/DFNet.xib b/macosx/plugins/DFNet/Base.lproj/DFNet.xib
index d1113943..673c8340 100644
--- a/macosx/plugins/DFNet/Base.lproj/DFNet.xib
+++ b/macosx/plugins/DFNet/Base.lproj/DFNet.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4510"/>
+        <deployment defaultVersion="1080" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="DFNetPlayPluginConfigController">
@@ -18,15 +18,15 @@
         <window title="Settings" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" wantsToBeColor="NO" animationBehavior="default" id="1">
             <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="340" height="160"/>
+            <rect key="contentRect" x="196" y="240" width="340" height="155"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
             <value key="minSize" type="size" width="340" height="151"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="340" height="160"/>
+                <rect key="frame" x="0.0" y="0.0" width="340" height="155"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9">
-                        <rect key="frame" x="126" y="118" width="194" height="22"/>
+                        <rect key="frame" x="126" y="113" width="194" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="194" id="31"/>
@@ -38,7 +38,7 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="17">
-                        <rect key="frame" x="126" y="86" width="194" height="22"/>
+                        <rect key="frame" x="126" y="81" width="194" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="33306" drawsBackground="YES" id="18">
                             <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#" negativeFormat="#" localizesFormat="NO" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" minimumFractionDigits="0" maximumFractionDigits="0" id="29">
@@ -55,7 +55,7 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19">
-                        <rect key="frame" x="17" y="120" width="104" height="17"/>
+                        <rect key="frame" x="18" y="115" width="102" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="IP Address:" id="20">
                             <font key="font" metaFont="system"/>
@@ -64,7 +64,7 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="21">
-                        <rect key="frame" x="17" y="88" width="104" height="17"/>
+                        <rect key="frame" x="18" y="83" width="102" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Port:" id="22">
                             <font key="font" metaFont="system"/>
@@ -73,7 +73,7 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="24">
-                        <rect key="frame" x="17" y="56" width="104" height="17"/>
+                        <rect key="frame" x="18" y="51" width="102" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Player Number:" id="25">
                             <font key="font" metaFont="system"/>
@@ -82,7 +82,7 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="26">
-                        <rect key="frame" x="126" y="54" width="194" height="22"/>
+                        <rect key="frame" x="126" y="49" width="194" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="1" drawsBackground="YES" id="27">
                             <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#" negativeFormat="#" localizesFormat="NO" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" minimumFractionDigits="0" maximumFractionDigits="0" id="30">
@@ -125,7 +125,6 @@ Gw
                     <constraint firstItem="26" firstAttribute="leading" secondItem="17" secondAttribute="leading" id="35"/>
                     <constraint firstAttribute="trailing" secondItem="9" secondAttribute="trailing" constant="20" symbolic="YES" id="45"/>
                     <constraint firstItem="17" firstAttribute="leading" secondItem="9" secondAttribute="leading" id="46"/>
-                    <constraint firstItem="21" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="47"/>
                     <constraint firstItem="19" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="48"/>
                     <constraint firstAttribute="bottom" secondItem="54" secondAttribute="bottom" constant="20" symbolic="YES" id="57"/>
                     <constraint firstAttribute="trailing" secondItem="54" secondAttribute="trailing" constant="20" symbolic="YES" id="58"/>
@@ -136,11 +135,13 @@ Gw
                     <constraint firstItem="21" firstAttribute="baseline" secondItem="17" secondAttribute="baseline" id="79"/>
                     <constraint firstItem="26" firstAttribute="top" secondItem="17" secondAttribute="bottom" constant="10" symbolic="YES" id="82"/>
                     <constraint firstItem="24" firstAttribute="baseline" secondItem="26" secondAttribute="baseline" id="83"/>
-                    <constraint firstItem="24" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="84"/>
                     <constraint firstItem="54" firstAttribute="baseline" secondItem="59" secondAttribute="baseline" id="Hiw-cw-hgP"/>
+                    <constraint firstItem="59" firstAttribute="top" secondItem="26" secondAttribute="bottom" constant="8" symbolic="YES" id="JbE-yM-l2f"/>
+                    <constraint firstItem="19" firstAttribute="leading" secondItem="24" secondAttribute="leading" id="Mc4-s1-QGX"/>
                     <constraint firstItem="26" firstAttribute="leading" secondItem="24" secondAttribute="trailing" constant="8" symbolic="YES" id="Z3c-SU-FF9"/>
-                    <constraint firstItem="9" firstAttribute="leading" secondItem="19" secondAttribute="trailing" constant="8" symbolic="YES" id="khN-2J-vyq"/>
-                    <constraint firstItem="17" firstAttribute="leading" secondItem="21" secondAttribute="trailing" constant="8" symbolic="YES" id="qkM-ee-2DJ"/>
+                    <constraint firstItem="19" firstAttribute="trailing" secondItem="21" secondAttribute="trailing" id="gqz-RX-N75"/>
+                    <constraint firstItem="19" firstAttribute="leading" secondItem="21" secondAttribute="leading" id="nv8-ol-viY"/>
+                    <constraint firstItem="19" firstAttribute="trailing" secondItem="24" secondAttribute="trailing" id="psN-cH-99I"/>
                     <constraint firstItem="9" firstAttribute="trailing" secondItem="26" secondAttribute="trailing" id="tih-ev-TML"/>
                     <constraint firstItem="9" firstAttribute="trailing" secondItem="17" secondAttribute="trailing" id="yvV-4Z-Fpf"/>
                 </constraints>
diff --git a/macosx/plugins/DFNet/Base.lproj/SockDialog.xib b/macosx/plugins/DFNet/Base.lproj/SockDialog.xib
index e2fa59e6..cdf10d1d 100644
--- a/macosx/plugins/DFNet/Base.lproj/SockDialog.xib
+++ b/macosx/plugins/DFNet/Base.lproj/SockDialog.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="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment defaultVersion="1080" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
@@ -13,23 +13,21 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application"/>
-        <window title="Connecting…" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" wantsToBeColor="NO" animationBehavior="default" id="1">
+        <window title="Connecting…" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" showsToolbarButton="NO" wantsToBeColor="NO" animationBehavior="alertPanel" id="1">
             <windowStyleMask key="styleMask" titled="YES" texturedBackground="YES"/>
+            <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES" transient="YES" ignoresCycle="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="371" width="259" height="124"/>
+            <rect key="contentRect" x="196" y="371" width="206" height="124"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
             <value key="minSize" type="size" width="380" height="140"/>
             <value key="maxSize" type="size" width="380" height="140"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="259" height="124"/>
+                <rect key="frame" x="0.0" y="0.0" width="206" height="124"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3">
-                        <rect key="frame" x="18" y="87" width="223" height="17"/>
+                        <rect key="frame" x="18" y="87" width="169" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="219" id="11"/>
-                        </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Waiting for connections..." id="4">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -37,14 +35,14 @@
                         </textFieldCell>
                     </textField>
                     <progressIndicator verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="6">
-                        <rect key="frame" x="42" y="60" width="174" height="20"/>
+                        <rect key="frame" x="16" y="60" width="174" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="174" id="19"/>
                         </constraints>
                     </progressIndicator>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="26">
-                        <rect key="frame" x="88" y="13" width="82" height="32"/>
+                        <rect key="frame" x="62" y="13" width="82" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="27">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -64,7 +62,7 @@ Gw
                     <constraint firstAttribute="bottom" secondItem="26" secondAttribute="bottom" constant="20" symbolic="YES" id="29"/>
                     <constraint firstItem="3" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="5Ll-g2-DWG"/>
                     <constraint firstItem="26" firstAttribute="top" secondItem="6" secondAttribute="bottom" constant="20" symbolic="YES" id="EeQ-6H-ewJ"/>
-                    <constraint firstAttribute="trailing" secondItem="3" secondAttribute="trailing" constant="20" symbolic="YES" id="WGc-wJ-nm5"/>
+                    <constraint firstAttribute="centerX" secondItem="3" secondAttribute="centerX" id="MVu-nA-W4y"/>
                     <constraint firstAttribute="centerX" secondItem="26" secondAttribute="centerX" id="aG8-6a-4Pp"/>
                     <constraint firstAttribute="centerX" secondItem="6" secondAttribute="centerX" id="dae-LS-2An"/>
                 </constraints>