[vlc-commits] macosx: playlist accessory view: Remove explicit sizes, center

David Fuhrmann git at videolan.org
Sun Oct 15 21:08:51 CEST 2017


vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Oct 14 14:52:59 2017 +0200| [912811536043720aa1856d95d4def67ad9131bfd] | committer: David Fuhrmann

macosx: playlist accessory view: Remove explicit sizes, center

Explicit sizes shall not be used to allow grow for l10n. Also
center the elements.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=912811536043720aa1856d95d4def67ad9131bfd
---

 modules/gui/macosx/UI/PlaylistAccessoryView.xib | 82 +++++++++++++------------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/modules/gui/macosx/UI/PlaylistAccessoryView.xib b/modules/gui/macosx/UI/PlaylistAccessoryView.xib
index 04759db84d..0dd5206aa5 100644
--- a/modules/gui/macosx/UI/PlaylistAccessoryView.xib
+++ b/modules/gui/macosx/UI/PlaylistAccessoryView.xib
@@ -1,61 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="17B25c" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16G29" 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="12121"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="VLCMainMenu">
             <connections>
                 <outlet property="playlistSaveAccessoryPopup" destination="3" id="Yp7-Fa-6HX"/>
                 <outlet property="playlistSaveAccessoryText" destination="2" id="D67-6A-IXs"/>
-                <outlet property="playlistSaveAccessoryView" destination="1" id="hQm-ev-onG"/>
+                <outlet property="playlistSaveAccessoryView" destination="efm-sw-3Se" id="Iu1-2v-bfo"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="1" userLabel="SaveAccessoryView">
-            <rect key="frame" x="0.0" y="0.0" width="384" height="39"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+        <customView id="efm-sw-3Se">
+            <rect key="frame" x="0.0" y="0.0" width="369" height="39"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3">
-                    <rect key="frame" x="105" y="6" width="268" height="26"/>
-                    <popUpButtonCell key="cell" type="push" title="Extended M3U" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="7" id="4">
-                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
-                        <menu key="menu" title="OtherViews" id="5">
-                            <items>
-                                <menuItem title="Extended M3U" state="on" id="7"/>
-                                <menuItem title="XML Shareable Playlist Format (XSPF)" id="6"/>
-                                <menuItem title="HTML Playlist" id="8"/>
-                            </items>
-                        </menu>
-                    </popUpButtonCell>
-                </popUpButton>
-                <textField horizontalHuggingPriority="150" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2">
-                    <rect key="frame" x="11" y="11" width="90" height="17"/>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="1" userLabel="SaveAccessoryView">
+                    <rect key="frame" x="0.0" y="0.0" width="369" height="39"/>
+                    <subviews>
+                        <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3">
+                            <rect key="frame" x="91" y="6" width="267" height="26"/>
+                            <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="4">
+                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="menu"/>
+                                <menu key="menu" title="OtherViews" id="5">
+                                    <items>
+                                        <menuItem title="Extended M3U" id="7"/>
+                                        <menuItem title="XML Shareable Playlist Format (XSPF)" id="6"/>
+                                        <menuItem title="HTML Playlist" id="8"/>
+                                    </items>
+                                </menu>
+                            </popUpButtonCell>
+                        </popUpButton>
+                        <textField horizontalHuggingPriority="249" verticalHuggingPriority="900" translatesAutoresizingMaskIntoConstraints="NO" id="2">
+                            <rect key="frame" x="11" y="11" width="76" height="17"/>
+                            <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="File Format:" usesSingleLineMode="YES" id="9">
+                                <font key="font" metaFont="system"/>
+                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                    </subviews>
                     <constraints>
-                        <constraint firstAttribute="height" constant="17" id="QVK-zK-EZq"/>
-                        <constraint firstAttribute="width" constant="86" id="nC1-Qm-yuV"/>
+                        <constraint firstItem="2" firstAttribute="top" secondItem="1" secondAttribute="top" constant="11" id="3a2-5d-kdq"/>
+                        <constraint firstItem="3" firstAttribute="leading" secondItem="2" secondAttribute="trailing" constant="8" id="5s2-Ut-CYG"/>
+                        <constraint firstItem="2" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="13" id="Fe1-XU-wIa"/>
+                        <constraint firstItem="3" firstAttribute="centerY" secondItem="2" secondAttribute="centerY" id="OTX-0S-cmU"/>
+                        <constraint firstAttribute="bottom" secondItem="2" secondAttribute="bottom" constant="11" id="PMa-7j-M4R"/>
+                        <constraint firstAttribute="trailing" secondItem="3" secondAttribute="trailing" constant="14" id="Rhz-TO-tdh"/>
                     </constraints>
-                    <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="File Format:" usesSingleLineMode="YES" id="9">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
+                </customView>
             </subviews>
             <constraints>
-                <constraint firstItem="2" firstAttribute="top" secondItem="1" secondAttribute="top" constant="11" id="3a2-5d-kdq"/>
-                <constraint firstItem="3" firstAttribute="leading" secondItem="2" secondAttribute="trailing" constant="8" id="5s2-Ut-CYG"/>
-                <constraint firstItem="2" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="13" id="Fe1-XU-wIa"/>
-                <constraint firstItem="3" firstAttribute="centerY" secondItem="2" secondAttribute="centerY" id="OTX-0S-cmU"/>
-                <constraint firstAttribute="bottom" secondItem="2" secondAttribute="bottom" constant="11" id="PMa-7j-M4R"/>
-                <constraint firstAttribute="trailing" secondItem="3" secondAttribute="trailing" constant="14" id="Rhz-TO-tdh"/>
-                <constraint firstItem="2" firstAttribute="centerY" secondItem="1" secondAttribute="centerY" id="dRs-Vr-PuE"/>
+                <constraint firstItem="1" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="efm-sw-3Se" secondAttribute="leading" id="HMJ-hb-goL"/>
+                <constraint firstItem="1" firstAttribute="centerX" secondItem="efm-sw-3Se" secondAttribute="centerX" id="b3K-3h-BWP"/>
+                <constraint firstItem="1" firstAttribute="top" secondItem="efm-sw-3Se" secondAttribute="top" id="kfO-Je-Tqf"/>
+                <constraint firstAttribute="bottom" secondItem="1" secondAttribute="bottom" id="s9i-3i-oRB"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1" secondAttribute="trailing" id="uQ3-JI-53e"/>
             </constraints>
-            <point key="canvasLocation" x="423" y="446.5"/>
         </customView>
     </objects>
 </document>



More information about the vlc-commits mailing list