vlc | branch: master | Felix Paul Kühne <[email protected]> | Fri Feb 5 10:11:45 2016 +0100| [efa1539353f35bce443a588c569735bca2252dd3] | committer: Felix Paul Kühne
macosx/Textfield Panel: switch to auto-layout > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=efa1539353f35bce443a588c569735bca2252dd3 --- .../Resources/English.lproj/TextfieldPanel.xib | 47 +++++++++++--------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/TextfieldPanel.xib b/extras/package/macosx/Resources/English.lproj/TextfieldPanel.xib index 8423b88..7ef505d 100644 --- a/extras/package/macosx/Resources/English.lproj/TextfieldPanel.xib +++ b/extras/package/macosx/Resources/English.lproj/TextfieldPanel.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10102" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <deployment identifier="macosx"/> <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10102"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="VLCTextfieldPanelController"> @@ -17,38 +17,34 @@ </connections> </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> - <customObject id="-3" userLabel="Application"/> + <customObject id="-3" userLabel="Application" customClass="NSObject"/> <window title="Save as new profile" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="2" userLabel="Enter Text"> <windowStyleMask key="styleMask" titled="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="265" y="520" width="612" height="159"/> - <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/> - <value key="maxSize" type="size" width="612" height="159"/> + <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/> <view key="contentView" id="3"> <rect key="frame" x="0.0" y="0.0" width="612" height="159"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <textField verticalHuggingPriority="750" id="4"> - <rect key="frame" x="17" y="122" width="578" height="17"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="4"> + <rect key="frame" x="17" y="122" width="129" height="17"/> <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Save as new profile" id="13"> <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" id="5"> - <rect key="frame" x="17" y="97" width="578" height="17"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="5"> + <rect key="frame" x="17" y="100" width="172" height="14"/> <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Enter a name for the new profile" usesSingleLineMode="YES" id="12"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <button verticalHuggingPriority="750" id="7"> - <rect key="frame" x="475" y="12" width="123" height="32"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES"/> + <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7"> + <rect key="frame" x="528" y="15" width="70" height="32"/> <buttonCell key="cell" type="push" title="Save" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="10"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -60,9 +56,8 @@ DQ <action selector="windowElementAction:" target="-2" id="57"/> </connections> </button> - <button verticalHuggingPriority="750" id="8"> - <rect key="frame" x="352" y="12" width="123" height="32"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES"/> + <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8"> + <rect key="frame" x="446" y="15" width="82" height="32"/> <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="9"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -74,9 +69,8 @@ Gw <action selector="windowElementAction:" target="-2" id="55"/> </connections> </button> - <textField verticalHuggingPriority="750" id="6"> - <rect key="frame" x="20" y="67" width="572" height="22"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6"> + <rect key="frame" x="19" y="68" width="573" height="22"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="11"> <font key="font" metaFont="system"/> <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> @@ -84,6 +78,19 @@ Gw </textFieldCell> </textField> </subviews> + <constraints> + <constraint firstItem="4" firstAttribute="top" secondItem="3" secondAttribute="top" constant="20" id="4Oc-x8-seM"/> + <constraint firstItem="7" firstAttribute="leading" secondItem="8" secondAttribute="trailing" constant="12" id="564-S6-DGN"/> + <constraint firstItem="4" firstAttribute="leading" secondItem="3" secondAttribute="leading" constant="19" id="6PC-8r-exg"/> + <constraint firstItem="7" firstAttribute="centerY" secondItem="8" secondAttribute="centerY" id="LiA-Xw-4Og"/> + <constraint firstItem="5" firstAttribute="leading" secondItem="4" secondAttribute="leading" id="UX0-7z-iJf"/> + <constraint firstItem="7" firstAttribute="trailing" secondItem="6" secondAttribute="trailing" id="VI5-Rn-1Fo"/> + <constraint firstAttribute="trailing" secondItem="6" secondAttribute="trailing" constant="20" id="XeS-rh-GeW"/> + <constraint firstItem="6" firstAttribute="top" secondItem="5" secondAttribute="bottom" constant="10" id="Y3E-qC-fAJ"/> + <constraint firstItem="5" firstAttribute="top" secondItem="4" secondAttribute="bottom" constant="8" id="srk-nM-3iQ"/> + <constraint firstItem="7" firstAttribute="top" secondItem="6" secondAttribute="bottom" constant="25" id="u2w-Ou-uGC"/> + <constraint firstItem="6" firstAttribute="leading" secondItem="5" secondAttribute="leading" id="zwT-Vi-paI"/> + </constraints> </view> </window> </objects> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
