vlc | branch: master | David Fuhrmann <[email protected]> | Sun Sep 3 15:49:03 2017 +0200| [948038d92997018ac8b37bcff4f169ec84fab0f0] | committer: David Fuhrmann
macosx: Fix some layout constraints in CAS panel > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=948038d92997018ac8b37bcff4f169ec84fab0f0 --- modules/gui/macosx/UI/AudioEffects.xib | 8 +- modules/gui/macosx/UI/ConvertAndSave.xib | 105 ++++++++++++--------- .../gui/macosx/VLCConvertAndSaveWindowController.h | 4 +- 3 files changed, 65 insertions(+), 52 deletions(-) diff --git a/modules/gui/macosx/UI/AudioEffects.xib b/modules/gui/macosx/UI/AudioEffects.xib index 56c3ff101b..2a23f7b72b 100644 --- a/modules/gui/macosx/UI/AudioEffects.xib +++ b/modules/gui/macosx/UI/AudioEffects.xib @@ -694,7 +694,7 @@ </textField> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="621"> <rect key="frame" x="359" y="151" width="39" height="17"/> - <buttonCell key="cell" type="roundRect" title="Reset" bezelStyle="roundedRect" image="20A2CD53-3C79-47D9-970B-DB16D0175EF5" imagePosition="overlaps" alignment="center" controlSize="mini" borderStyle="border" inset="2" id="622" customClass="VLCHUDButtonCell"> + <buttonCell key="cell" type="roundRect" title="Reset" bezelStyle="roundedRect" image="BA3BEF7B-F847-4332-9E83-A40C1C2F2E41" imagePosition="overlaps" alignment="center" controlSize="mini" borderStyle="border" inset="2" id="622" customClass="VLCHUDButtonCell"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="miniSystem"/> </buttonCell> @@ -800,7 +800,7 @@ <subviews> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="618"> <rect key="frame" x="351" y="145" width="39" height="17"/> - <buttonCell key="cell" type="roundRect" title="Reset" bezelStyle="roundedRect" image="FE02FB57-922F-4AD2-BC53-03C973975F99" imagePosition="overlaps" alignment="center" controlSize="mini" borderStyle="border" inset="2" id="619" customClass="VLCHUDButtonCell"> + <buttonCell key="cell" type="roundRect" title="Reset" bezelStyle="roundedRect" image="E0A1FE01-C40F-412F-A937-7F99CF85B282" imagePosition="overlaps" alignment="center" controlSize="mini" borderStyle="border" inset="2" id="619" customClass="VLCHUDButtonCell"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="miniSystem"/> </buttonCell> @@ -1150,7 +1150,7 @@ <userDefaultsController representsSharedInstance="YES" id="350"/> </objects> <resources> - <image name="20A2CD53-3C79-47D9-970B-DB16D0175EF5" width="1" height="1"> + <image name="BA3BEF7B-F847-4332-9E83-A40C1C2F2E41" width="1" height="1"> <mutableData key="keyedArchiveRepresentation"> YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw @@ -1191,7 +1191,7 @@ B04HVwdcB2QHZwdsB3sHfweGB44HmwegB6IHpAepB7EHtAe5B8EHxAfWB9kH3gAAAAAAAAIBAAAAAAAA AEEAAAAAAAAAAAAAAAAAAAfgA </mutableData> </image> - <image name="FE02FB57-922F-4AD2-BC53-03C973975F99" width="1" height="1"> + <image name="E0A1FE01-C40F-412F-A937-7F99CF85B282" width="1" height="1"> <mutableData key="keyedArchiveRepresentation"> YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw diff --git a/modules/gui/macosx/UI/ConvertAndSave.xib b/modules/gui/macosx/UI/ConvertAndSave.xib index d22a76afcc..f14d6c8085 100644 --- a/modules/gui/macosx/UI/ConvertAndSave.xib +++ b/modules/gui/macosx/UI/ConvertAndSave.xib @@ -1,6 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<?xml version="1.0" encoding="UTF-8"?> +<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="10117"/> <capability name="box content view" minToolsVersion="7.0"/> @@ -99,7 +100,7 @@ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="196" y="20" width="663" height="490"/> - <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/> + <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/> <value key="minSize" type="size" width="663" height="490"/> <value key="maxSize" type="size" width="663" height="490"/> <view key="contentView" id="2"> @@ -169,50 +170,63 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="11"> - <rect key="frame" x="15" y="56" width="123" height="22"/> + <rect key="frame" x="10" y="59" width="123" height="22"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Choose Profile" id="12"> <font key="font" metaFont="system" size="18"/> <color key="textColor" name="headerColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="13"> - <rect key="frame" x="150" y="19" width="223" height="26"/> + <customView translatesAutoresizingMaskIntoConstraints="NO" id="aLk-M5-CXz" userLabel="Profile layout guide"> + <rect key="frame" x="149" y="25" width="330" height="21"/> + <subviews> + <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="13"> + <rect key="frame" x="-2" y="-3" width="223" height="26"/> + <constraints> + <constraint firstAttribute="width" constant="218" id="CVO-zt-Bx6"/> + </constraints> + <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="16" id="14"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="menu"/> + <menu key="menu" title="OtherViews" id="15"> + <items> + <menuItem title="Item 1" state="on" id="16"/> + <menuItem title="Item 2" id="17"/> + <menuItem title="Item 3" id="18"/> + </items> + </menu> + </popUpButtonCell> + <connections> + <action selector="switchProfile:" target="-2" id="628"/> + </connections> + </popUpButton> + <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19"> + <rect key="frame" x="220" y="-7" width="116" height="32"/> + <buttonCell key="cell" type="push" title="Customize..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="20"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + <connections> + <action selector="customizeProfile:" target="-2" id="629"/> + </connections> + </button> + </subviews> <constraints> - <constraint firstAttribute="width" constant="218" id="CVO-zt-Bx6"/> + <constraint firstItem="19" firstAttribute="leading" secondItem="13" secondAttribute="trailing" constant="8" symbolic="YES" id="0bR-fY-vgy"/> + <constraint firstItem="19" firstAttribute="top" secondItem="aLk-M5-CXz" secondAttribute="top" id="3yL-gw-ttb"/> + <constraint firstAttribute="trailing" secondItem="19" secondAttribute="trailing" id="4CP-Wn-qWR"/> + <constraint firstItem="13" firstAttribute="top" secondItem="aLk-M5-CXz" secondAttribute="top" id="PM6-Jt-QVM"/> + <constraint firstItem="13" firstAttribute="leading" secondItem="aLk-M5-CXz" secondAttribute="leading" id="VO6-zu-e27"/> + <constraint firstAttribute="bottom" secondItem="19" secondAttribute="bottom" id="g6z-eq-qEn"/> + <constraint firstAttribute="bottom" secondItem="13" secondAttribute="bottom" id="srf-uj-lEZ"/> </constraints> - <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="16" id="14"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="menu"/> - <menu key="menu" title="OtherViews" id="15"> - <items> - <menuItem title="Item 1" state="on" id="16"/> - <menuItem title="Item 2" id="17"/> - <menuItem title="Item 3" id="18"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="switchProfile:" target="-2" id="628"/> - </connections> - </popUpButton> - <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19"> - <rect key="frame" x="372" y="15" width="116" height="32"/> - <buttonCell key="cell" type="push" title="Customize..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="20"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - <connections> - <action selector="customizeProfile:" target="-2" id="629"/> - </connections> - </button> + </customView> </subviews> <constraints> - <constraint firstItem="11" firstAttribute="leading" secondItem="CvM-Oi-SCn" secondAttribute="leading" constant="17" id="1ay-f5-jrJ"/> - <constraint firstAttribute="bottom" secondItem="13" secondAttribute="bottom" constant="22" id="AxG-jq-w4h"/> - <constraint firstItem="13" firstAttribute="centerY" secondItem="19" secondAttribute="centerY" id="Heo-Bn-zdZ"/> - <constraint firstItem="19" firstAttribute="leading" secondItem="13" secondAttribute="trailing" constant="8" id="Ig5-Jd-TTX"/> - <constraint firstItem="11" firstAttribute="top" secondItem="CvM-Oi-SCn" secondAttribute="top" constant="12" id="aGV-0s-ZiL"/> + <constraint firstItem="aLk-M5-CXz" firstAttribute="centerY" secondItem="CvM-Oi-SCn" secondAttribute="centerY" constant="10" id="DkE-zl-Kqv"/> + <constraint firstItem="11" firstAttribute="leading" secondItem="CvM-Oi-SCn" secondAttribute="leading" constant="12" id="FoQ-Ct-NDi"/> + <constraint firstItem="aLk-M5-CXz" firstAttribute="centerX" secondItem="CvM-Oi-SCn" secondAttribute="centerX" id="ktb-bq-07c"/> + <constraint firstItem="11" firstAttribute="top" secondItem="CvM-Oi-SCn" secondAttribute="top" constant="9" id="q41-Ai-snr"/> </constraints> </view> <constraints> @@ -237,7 +251,7 @@ </textFieldCell> </textField> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="389"> - <rect key="frame" x="230" y="17" width="84" height="32"/> + <rect key="frame" x="230" y="22" width="84" height="32"/> <buttonCell key="cell" type="push" title="Stream" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="390"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -247,7 +261,7 @@ </connections> </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="392"> - <rect key="frame" x="314" y="17" width="112" height="32"/> + <rect key="frame" x="314" y="22" width="112" height="32"/> <buttonCell key="cell" type="push" title="Save as File" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="393"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -257,7 +271,7 @@ </connections> </button> <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="404"> - <rect key="frame" x="11" y="17" width="32" height="32"/> + <rect key="frame" x="11" y="22" width="32" height="32"/> <buttonCell key="cell" type="round" title="x" bezelStyle="circular" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" id="405"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="smallSystem"/> @@ -266,8 +280,8 @@ <action selector="cancelDestination:" target="-2" id="630"/> </connections> </button> - <customView translatesAutoresizingMaskIntoConstraints="NO" id="QZC-Ij-ExL"> - <rect key="frame" x="305" y="24" width="17" height="21"/> + <customView translatesAutoresizingMaskIntoConstraints="NO" id="QZC-Ij-ExL" userLabel="Middle centered helper view"> + <rect key="frame" x="305" y="29" width="17" height="21"/> <constraints> <constraint firstAttribute="width" constant="17" id="rtm-Xf-9D8"/> </constraints> @@ -280,9 +294,9 @@ <constraint firstItem="404" firstAttribute="centerY" secondItem="389" secondAttribute="centerY" id="Elm-ny-3z0"/> <constraint firstItem="35" firstAttribute="top" secondItem="AhF-YR-JeB" secondAttribute="top" constant="12" id="Ksl-Kb-LMW"/> <constraint firstItem="QZC-Ij-ExL" firstAttribute="leading" secondItem="389" secondAttribute="trailing" constant="-3" id="WbW-cJ-1IX"/> + <constraint firstItem="QZC-Ij-ExL" firstAttribute="centerY" secondItem="AhF-YR-JeB" secondAttribute="centerY" constant="10" id="ZSO-2c-zCe"/> <constraint firstItem="QZC-Ij-ExL" firstAttribute="height" secondItem="392" secondAttribute="height" id="cox-aD-z4G"/> <constraint firstItem="35" firstAttribute="leading" secondItem="AhF-YR-JeB" secondAttribute="leading" constant="17" id="cwo-xq-mtI"/> - <constraint firstAttribute="bottom" secondItem="404" secondAttribute="bottom" constant="24" id="svG-qy-TqZ"/> <constraint firstItem="389" firstAttribute="centerY" secondItem="392" secondAttribute="centerY" id="wML-B4-jxu"/> <constraint firstItem="QZC-Ij-ExL" firstAttribute="centerY" secondItem="392" secondAttribute="centerY" id="x9n-V7-R5B"/> </constraints> @@ -311,7 +325,6 @@ DQ <constraints> <constraint firstAttribute="trailing" secondItem="21" secondAttribute="trailing" constant="20" id="91H-56-94D"/> <constraint firstItem="3" firstAttribute="centerX" secondItem="2" secondAttribute="centerX" id="D8S-Yb-Z4O"/> - <constraint firstItem="13" firstAttribute="trailing" secondItem="4" secondAttribute="trailing" id="G2e-pX-jRS"/> <constraint firstItem="537" firstAttribute="top" secondItem="2" secondAttribute="top" constant="22" id="IVr-QH-vRP"/> <constraint firstItem="32" firstAttribute="centerX" secondItem="2" secondAttribute="centerX" id="T3g-f0-fmy"/> <constraint firstItem="32" firstAttribute="top" secondItem="10" secondAttribute="bottom" constant="9" id="bGy-Nj-s2Q"/> @@ -355,7 +368,7 @@ DQ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="340" y="255" width="558" height="382"/> - <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/> + <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/> <view key="contentView" id="132"> <rect key="frame" x="0.0" y="0.0" width="558" height="382"/> <autoresizingMask key="autoresizingMask"/> @@ -1049,7 +1062,7 @@ Gw <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="131" y="60" width="532" height="368"/> - <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/> + <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/> <view key="contentView" id="309"> <rect key="frame" x="0.0" y="0.0" width="532" height="368"/> <autoresizingMask key="autoresizingMask"/> diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.h b/modules/gui/macosx/VLCConvertAndSaveWindowController.h index d3dbc6fd3f..930b086946 100644 --- a/modules/gui/macosx/VLCConvertAndSaveWindowController.h +++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.h @@ -52,12 +52,12 @@ @property (weak) IBOutlet NSView *dropinView; @property (weak) IBOutlet VLCDropDisabledImageView *dropinIcon; @property (weak) IBOutlet NSTextField *dropinMediaLabel; -@property (weak) IBOutlet NSView *fileDestinationView; +@property (strong) IBOutlet NSView *fileDestinationView; @property (weak) IBOutlet NSImageView *fileDestinationIcon; @property (weak) IBOutlet NSTextField *fileDestinationFileName; @property (weak) IBOutlet NSTextField *fileDestinationFileNameStub; @property (weak) IBOutlet NSButton *fileDestinationBrowseButton; -@property (weak) IBOutlet NSView *streamDestinationView; +@property (strong) IBOutlet NSView *streamDestinationView; @property (weak) IBOutlet NSTextField *streamDestinationURLLabel; @property (weak) IBOutlet NSButton *streamDestinationButton; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
