macosx/bookmarks: switch to auto-layout
authorFelix Paul Kühne <fkuehne@videolan.org>
Fri, 5 Feb 2016 12:37:14 +0000 (13:37 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Fri, 5 Feb 2016 12:37:14 +0000 (13:37 +0100)
extras/package/macosx/Resources/English.lproj/Bookmarks.xib
extras/package/macosx/Resources/English.lproj/CoreDialogs.xib

index 61b87f3..194b9d9 100644 (file)
@@ -1,8 +1,8 @@
 <?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"/>
-        <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="VLCBookmarks">
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Bookmarks" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="bookmarks" animationBehavior="default" id="84" userLabel="Bookmarks" customClass="NSPanel">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" utility="YES" HUD="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="340" y="330" width="540" height="307"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
             <view key="contentView" id="85">
                 <rect key="frame" x="0.0" y="0.0" width="540" height="307"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <button verticalHuggingPriority="750" id="88">
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="88">
                         <rect key="frame" x="20" y="268" width="98" height="19"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="roundRect" title="Add" bezelStyle="roundedRect" alignment="center" borderStyle="border" inset="2" id="89" customClass="BGHUDButtonCell">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="titleBar" size="12"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="themeKey" value="gradientTheme"/>
                             </userDefinedRuntimeAttributes>
                             <action selector="add:" target="-2" id="177"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" id="90">
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="90">
                         <rect key="frame" x="20" y="243" width="98" height="19"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="roundRect" title="Edit" bezelStyle="roundedRect" alignment="center" enabled="NO" borderStyle="border" inset="2" id="91" customClass="BGHUDButtonCell">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="titleBar" size="12"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="themeKey" value="gradientTheme"/>
                             </userDefinedRuntimeAttributes>
                             <action selector="edit:" target="-2" id="179"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" id="92">
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="92">
                         <rect key="frame" x="20" y="218" width="98" height="19"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="roundRect" title="Remove" bezelStyle="roundedRect" alignment="center" enabled="NO" borderStyle="border" inset="2" id="93" customClass="BGHUDButtonCell">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="titleBar" size="12"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="themeKey" value="gradientTheme"/>
                             </userDefinedRuntimeAttributes>
                             <action selector="remove:" target="-2" id="183"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" id="94">
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="94">
                         <rect key="frame" x="20" y="193" width="98" height="19"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="roundRect" title="Clear" bezelStyle="roundedRect" alignment="center" borderStyle="border" inset="2" id="95" customClass="BGHUDButtonCell">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="titleBar" size="12"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="themeKey" value="gradientTheme"/>
                             </userDefinedRuntimeAttributes>
                             <action selector="clear:" target="-2" id="178"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" id="96">
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="96">
                         <rect key="frame" x="20" y="133" width="98" height="19"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="roundRect" title="Extract" bezelStyle="roundedRect" alignment="center" borderStyle="border" inset="2" id="97" customClass="BGHUDButtonCell">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="titleBar" size="12"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="themeKey" value="gradientTheme"/>
                             </userDefinedRuntimeAttributes>
                             <action selector="extract:" target="-2" id="182"/>
                         </connections>
                     </button>
-                    <scrollView borderType="line" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="107" customClass="BGHUDScrollView">
+                    <scrollView borderType="line" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="107" customClass="BGHUDScrollView">
                         <rect key="frame" x="126" y="20" width="394" height="276"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="KmY-DA-2er">
                             <rect key="frame" x="1" y="24" width="392" height="251"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" autosaveColumns="NO" autosaveName="bookmarks-table" headerView="111" id="110" customClass="BGHUDTableView">
-                                    <rect key="frame" x="0.0" y="0.0" width="392" height="251"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="382" height="19"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
                             </subviews>
                             <color key="backgroundColor" name="controlDarkShadowColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="109" customClass="BGHUDScroller">
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="109" customClass="BGHUDScroller">
                             <rect key="frame" x="1" y="260" width="377" height="15"/>
                             <autoresizingMask key="autoresizingMask"/>
                             <userDefinedRuntimeAttributes>
                         </userDefinedRuntimeAttributes>
                     </scrollView>
                 </subviews>
+                <constraints>
+                    <constraint firstItem="107" firstAttribute="leading" secondItem="96" secondAttribute="trailing" constant="8" id="6g9-RT-DuR"/>
+                    <constraint firstItem="107" firstAttribute="leading" secondItem="90" secondAttribute="trailing" constant="8" id="9X9-yE-SIP"/>
+                    <constraint firstItem="92" firstAttribute="top" secondItem="90" secondAttribute="bottom" constant="7" id="A88-z3-fCb"/>
+                    <constraint firstAttribute="bottom" secondItem="107" secondAttribute="bottom" constant="20" id="BRp-2T-87k"/>
+                    <constraint firstItem="107" firstAttribute="leading" secondItem="85" secondAttribute="leading" constant="126" id="Eue-hS-z8E"/>
+                    <constraint firstItem="94" firstAttribute="leading" secondItem="85" secondAttribute="leading" constant="20" id="FOs-iP-fF8"/>
+                    <constraint firstAttribute="trailing" secondItem="107" secondAttribute="trailing" constant="20" id="G5G-Zl-egd"/>
+                    <constraint firstItem="90" firstAttribute="leading" secondItem="85" secondAttribute="leading" constant="20" id="IQa-1D-B9p"/>
+                    <constraint firstItem="107" firstAttribute="leading" secondItem="88" secondAttribute="trailing" constant="8" id="Ltc-GA-VMt"/>
+                    <constraint firstItem="107" firstAttribute="leading" secondItem="94" secondAttribute="trailing" constant="8" id="N3T-ZA-ej2"/>
+                    <constraint firstItem="88" firstAttribute="top" secondItem="85" secondAttribute="top" constant="20" id="WP1-gk-lha"/>
+                    <constraint firstItem="92" firstAttribute="leading" secondItem="85" secondAttribute="leading" constant="20" id="epp-d9-CZ3"/>
+                    <constraint firstItem="96" firstAttribute="leading" secondItem="85" secondAttribute="leading" constant="20" id="fl1-Eg-POd"/>
+                    <constraint firstItem="94" firstAttribute="top" secondItem="92" secondAttribute="bottom" constant="7" id="hSm-2D-FnN"/>
+                    <constraint firstItem="107" firstAttribute="leading" secondItem="92" secondAttribute="trailing" constant="8" id="nMK-MO-8IJ"/>
+                    <constraint firstItem="90" firstAttribute="top" secondItem="88" secondAttribute="bottom" constant="7" id="qG7-2g-FtJ"/>
+                    <constraint firstItem="96" firstAttribute="top" secondItem="94" secondAttribute="bottom" constant="42" id="tPx-97-iRX"/>
+                    <constraint firstItem="88" firstAttribute="leading" secondItem="85" secondAttribute="leading" constant="20" id="uNA-di-0LF"/>
+                    <constraint firstItem="107" firstAttribute="top" secondItem="85" secondAttribute="top" constant="11" id="xmY-ER-h97"/>
+                </constraints>
             </view>
         </window>
         <window title="Bookmark inspector" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="133" userLabel="EditBookmarks" customClass="NSPanel">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" utility="YES" HUD="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="340" y="401" width="298" height="125"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
             <view key="contentView" id="134">
                 <rect key="frame" x="0.0" y="0.0" width="298" height="125"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <textField verticalHuggingPriority="750" id="135">
+                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="135">
                         <rect key="frame" x="74" y="83" width="204" height="22"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="204" id="bLc-El-nRp"/>
+                        </constraints>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" id="136" customClass="BGHUDTextFieldCell">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </userDefinedRuntimeAttributes>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" id="137">
+                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="137">
                         <rect key="frame" x="74" y="51" width="204" 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" id="138" customClass="BGHUDTextFieldCell">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </userDefinedRuntimeAttributes>
                         </textFieldCell>
                     </textField>
-                    <button verticalHuggingPriority="750" id="141">
-                        <rect key="frame" x="180" y="18" width="98" height="19"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="141">
+                        <rect key="frame" x="246" y="18" width="32" height="19"/>
                         <buttonCell key="cell" type="roundRect" title="OK" bezelStyle="roundedRect" alignment="center" borderStyle="border" inset="2" id="142" customClass="BGHUDButtonCell">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="titleBar" size="12"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <string key="keyEquivalent" base64-UTF8="YES">
 DQ
 </string>
@@ -227,12 +242,11 @@ DQ
                             <action selector="edit_ok:" target="-2" id="181"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" id="143">
-                        <rect key="frame" x="74" y="18" width="98" height="19"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="143">
+                        <rect key="frame" x="185" y="18" width="53" height="19"/>
                         <buttonCell key="cell" type="roundRect" title="Cancel" bezelStyle="roundedRect" alignment="center" borderStyle="border" inset="2" id="144" customClass="BGHUDButtonCell">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="titleBar" size="12"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <string key="keyEquivalent" base64-UTF8="YES">
 Gw
 </string>
@@ -244,9 +258,8 @@ Gw
                             <action selector="edit_cancel:" target="-2" id="180"/>
                         </connections>
                     </button>
-                    <textField verticalHuggingPriority="750" id="145" customClass="BGHUDLabel">
-                        <rect key="frame" x="17" y="85" width="52" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="145" customClass="BGHUDLabel">
+                        <rect key="frame" x="25" y="85" width="44" height="17"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Name:" id="146">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -256,9 +269,8 @@ Gw
                             <userDefinedRuntimeAttribute type="string" keyPath="themeKey" value="gradientTheme"/>
                         </userDefinedRuntimeAttributes>
                     </textField>
-                    <textField verticalHuggingPriority="750" id="147" customClass="BGHUDLabel">
-                        <rect key="frame" x="17" y="53" width="52" height="17"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="147" customClass="BGHUDLabel">
+                        <rect key="frame" x="31" y="53" width="38" height="17"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Time:" id="148">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -269,6 +281,21 @@ Gw
                         </userDefinedRuntimeAttributes>
                     </textField>
                 </subviews>
+                <constraints>
+                    <constraint firstAttribute="bottom" secondItem="141" secondAttribute="bottom" constant="19" id="0Ll-rf-AZ3"/>
+                    <constraint firstAttribute="trailing" secondItem="141" secondAttribute="trailing" constant="20" id="51H-Gl-Wm6"/>
+                    <constraint firstItem="137" firstAttribute="trailing" secondItem="135" secondAttribute="trailing" id="Ibp-wb-N3K"/>
+                    <constraint firstItem="137" firstAttribute="width" secondItem="135" secondAttribute="width" id="KDT-cT-78n"/>
+                    <constraint firstItem="145" firstAttribute="centerY" secondItem="135" secondAttribute="centerY" id="N5h-2o-PKj"/>
+                    <constraint firstItem="135" firstAttribute="leading" secondItem="145" secondAttribute="trailing" constant="7" id="Ozi-Tq-KpZ"/>
+                    <constraint firstItem="137" firstAttribute="top" secondItem="135" secondAttribute="bottom" constant="10" id="SLF-If-gXP"/>
+                    <constraint firstItem="135" firstAttribute="top" secondItem="134" secondAttribute="top" constant="20" id="T08-hy-5Zj"/>
+                    <constraint firstItem="141" firstAttribute="leading" secondItem="143" secondAttribute="trailing" constant="8" id="TrP-09-F93"/>
+                    <constraint firstItem="147" firstAttribute="centerY" secondItem="137" secondAttribute="centerY" id="aQe-Z4-wmD"/>
+                    <constraint firstItem="137" firstAttribute="leading" secondItem="147" secondAttribute="trailing" constant="7" id="juq-Oe-r8e"/>
+                    <constraint firstAttribute="trailing" secondItem="135" secondAttribute="trailing" constant="20" id="mS1-KH-zaF"/>
+                    <constraint firstItem="143" firstAttribute="centerY" secondItem="141" secondAttribute="centerY" id="qXj-mZ-5ck"/>
+                </constraints>
             </view>
         </window>
     </objects>
index 3ca6ebb..f6cebff 100644 (file)
@@ -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" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1070" 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="VLCCoreDialogProvider">