vlc | branch: master | Felix Paul Kühne <[email protected]> | Fri Feb 5 10:11:31 2016 +0100| [e3fcfadb425caf13b2e42cef317b3d587698e98c] | committer: Felix Paul Kühne
macosx/Popup Panel: switch to auto-layout > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e3fcfadb425caf13b2e42cef317b3d587698e98c --- .../macosx/Resources/English.lproj/PopupPanel.xib | 49 ++++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/PopupPanel.xib b/extras/package/macosx/Resources/English.lproj/PopupPanel.xib index 07aab6f..e692dbc 100644 --- a/extras/package/macosx/Resources/English.lproj/PopupPanel.xib +++ b/extras/package/macosx/Resources/English.lproj/PopupPanel.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="VLCPopupPanelController"> @@ -17,39 +17,36 @@ </connections> </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> - <customObject id="-3" userLabel="Application"/> + <customObject id="-3" userLabel="Application" customClass="NSObject"/> <window title="Remove a profile" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1" userLabel="Select Item"> <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"/> + <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/> <value key="minSize" type="size" width="612" height="159"/> <value key="maxSize" type="size" width="612" height="159"/> <view key="contentView" id="14"> <rect key="frame" x="0.0" y="0.0" width="612" height="159"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <textField verticalHuggingPriority="750" id="18"> - <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="18"> + <rect key="frame" x="17" y="122" width="112" height="17"/> <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Remove a profile" id="25"> <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="17"> - <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="17"> + <rect key="frame" x="17" y="100" width="230" height="14"/> <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Select the profile you would like to remove:" usesSingleLineMode="YES" id="26"> <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="16"> - <rect key="frame" x="475" y="12" width="123" height="32"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES"/> + <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="16"> + <rect key="frame" x="509" y="13" width="89" height="32"/> <buttonCell key="cell" type="push" title="Remove" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="27"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -61,9 +58,8 @@ DQ <action selector="windowElementAction:" target="-2" id="58"/> </connections> </button> - <button verticalHuggingPriority="750" id="15"> - <rect key="frame" x="352" y="12" width="123" height="32"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES"/> + <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="15"> + <rect key="frame" x="427" y="13" width="82" height="32"/> <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="28"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -75,12 +71,11 @@ Gw <action selector="windowElementAction:" target="-2" id="57"/> </connections> </button> - <popUpButton verticalHuggingPriority="750" id="19"> - <rect key="frame" x="17" y="64" width="578" height="26"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19"> + <rect key="frame" x="17" y="66" width="578" height="26"/> <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="22" id="20"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> + <font key="font" metaFont="menu"/> <menu key="menu" title="OtherViews" id="21"> <items> <menuItem title="Item 1" state="on" id="22"/> @@ -91,6 +86,20 @@ Gw </popUpButtonCell> </popUpButton> </subviews> + <constraints> + <constraint firstItem="16" firstAttribute="leading" secondItem="15" secondAttribute="trailing" constant="12" id="0xF-7k-lNe"/> + <constraint firstItem="17" firstAttribute="top" secondItem="18" secondAttribute="bottom" constant="8" id="48p-Px-NO6"/> + <constraint firstItem="17" firstAttribute="leading" secondItem="18" secondAttribute="leading" id="EUc-zh-2bg"/> + <constraint firstItem="18" firstAttribute="leading" secondItem="14" secondAttribute="leading" constant="19" id="IeJ-Jq-PC1"/> + <constraint firstItem="16" firstAttribute="top" secondItem="15" secondAttribute="bottom" constant="-21" id="RxG-QG-83V"/> + <constraint firstAttribute="bottom" secondItem="16" secondAttribute="bottom" constant="20" id="Zsd-2P-O34"/> + <constraint firstItem="16" firstAttribute="centerY" secondItem="15" secondAttribute="centerY" id="ajf-qO-uAB"/> + <constraint firstItem="17" firstAttribute="leading" secondItem="19" secondAttribute="leading" id="ohp-23-GRk"/> + <constraint firstAttribute="trailing" secondItem="19" secondAttribute="trailing" constant="20" id="s0H-w9-ufO"/> + <constraint firstItem="16" firstAttribute="trailing" secondItem="19" secondAttribute="trailing" id="u6M-dv-Ew9"/> + <constraint firstItem="19" firstAttribute="top" secondItem="17" secondAttribute="bottom" constant="10" id="uOa-iI-ZVT"/> + <constraint firstItem="18" firstAttribute="top" secondItem="14" secondAttribute="top" constant="20" id="xkV-Dp-NIO"/> + </constraints> </view> </window> </objects> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
