vlc | branch: master | Felix Paul Kühne <[email protected]> | Fri Feb 5 10:30:50 2016 +0100| [3472e5eeb48ae83379c4f93b7f5ea6a53c72bff3] | committer: Felix Paul Kühne
macosx/Help: switch to auto-layout > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3472e5eeb48ae83379c4f93b7f5ea6a53c72bff3 --- .../macosx/Resources/English.lproj/Help.xib | 42 ++++++++++++-------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/Help.xib b/extras/package/macosx/Resources/English.lproj/Help.xib index 90898b8..7f54571 100644 --- a/extras/package/macosx/Resources/English.lproj/Help.xib +++ b/extras/package/macosx/Resources/English.lproj/Help.xib @@ -1,10 +1,10 @@ <?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.WebKitIBPlugin" version="10102"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/> + <plugIn identifier="com.apple.WebKitIBPlugin" version="9531"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="HelpWindowController"> @@ -17,7 +17,7 @@ </connections> </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> - <customObject id="-3" userLabel="Application"/> + <customObject id="-3" userLabel="Application" customClass="NSObject"/> <window title="Help" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="2239" userLabel="Help"> <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> @@ -28,17 +28,17 @@ <rect key="frame" x="0.0" y="0.0" width="480" height="400"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <webView id="2241"> + <webView translatesAutoresizingMaskIntoConstraints="NO" id="2241"> <rect key="frame" x="0.0" y="40" width="480" height="360"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12" plugInsEnabled="NO" javaEnabled="NO" javaScriptEnabled="NO" javaScriptCanOpenWindowsAutomatically="NO" loadsImagesAutomatically="NO" allowsAnimatedImages="NO" allowsAnimatedImageLooping="NO"/> + <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12" plugInsEnabled="NO" javaEnabled="NO" javaScriptEnabled="NO" javaScriptCanOpenWindowsAutomatically="NO" loadsImagesAutomatically="NO" allowsAnimatedImages="NO" allowsAnimatedImageLooping="NO"> + <nil key="identifier"/> + </webPreferences> <connections> <outlet property="frameLoadDelegate" destination="-2" id="2340"/> </connections> </webView> - <button verticalHuggingPriority="750" id="2256"> - <rect key="frame" x="20" y="8" width="39" height="25"/> - <autoresizingMask key="autoresizingMask"/> + <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2256"> + <rect key="frame" x="20" y="8" width="27" height="25"/> <buttonCell key="cell" type="roundTextured" title="⌂" bezelStyle="texturedRounded" alignment="center" borderStyle="border" inset="2" id="2275"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="systemBold" size="20"/> @@ -47,9 +47,8 @@ <action selector="helpGoHome:" target="-2" id="2338"/> </connections> </button> - <button verticalHuggingPriority="750" id="2257"> - <rect key="frame" x="67" y="8" width="39" height="25"/> - <autoresizingMask key="autoresizingMask"/> + <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2257"> + <rect key="frame" x="55" y="8" width="32" height="25"/> <buttonCell key="cell" type="roundTextured" title="←" bezelStyle="texturedRounded" alignment="center" borderStyle="border" inset="2" id="2276"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="systemBold" size="18"/> @@ -58,9 +57,8 @@ <action selector="goBack:" target="2241" id="2267"/> </connections> </button> - <button verticalHuggingPriority="750" id="2258"> - <rect key="frame" x="114" y="8" width="39" height="25"/> - <autoresizingMask key="autoresizingMask"/> + <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2258"> + <rect key="frame" x="95" y="8" width="32" height="25"/> <buttonCell key="cell" type="roundTextured" title="→" bezelStyle="texturedRounded" alignment="center" borderStyle="border" inset="2" id="2277"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="systemBold" size="18"/> @@ -70,6 +68,18 @@ </connections> </button> </subviews> + <constraints> + <constraint firstItem="2257" firstAttribute="leading" secondItem="2256" secondAttribute="trailing" constant="8" id="6Va-Ur-0gs"/> + <constraint firstItem="2241" firstAttribute="top" secondItem="2240" secondAttribute="top" id="7J6-p5-r45"/> + <constraint firstAttribute="trailing" secondItem="2241" secondAttribute="trailing" id="CYF-2C-pXI"/> + <constraint firstItem="2258" firstAttribute="leading" secondItem="2257" secondAttribute="trailing" constant="8" id="JGE-np-3B3"/> + <constraint firstItem="2241" firstAttribute="leading" secondItem="2240" secondAttribute="leading" id="XlN-01-Yyk"/> + <constraint firstItem="2256" firstAttribute="leading" secondItem="2240" secondAttribute="leading" constant="20" id="YuN-8j-3ks"/> + <constraint firstAttribute="bottom" secondItem="2256" secondAttribute="bottom" constant="10" id="ZKn-0H-1ii"/> + <constraint firstAttribute="bottom" secondItem="2241" secondAttribute="bottom" constant="40" id="qEX-nC-QiS"/> + <constraint firstItem="2256" firstAttribute="centerY" secondItem="2257" secondAttribute="centerY" id="vba-6f-BZO"/> + <constraint firstItem="2257" firstAttribute="centerY" secondItem="2258" secondAttribute="centerY" id="xIG-Tk-diy"/> + </constraints> </view> </window> </objects> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
