vlc | branch: master | David Fuhrmann <[email protected]> | Sun Nov 18 15:59:07 2018 +0100| [6b365a1ca1c5c35a6369e4fea1bee6924082bb6c] | committer: David Fuhrmann
macosx: Fix UI issue in selector for stream output > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6b365a1ca1c5c35a6369e4fea1bee6924082bb6c --- modules/gui/macosx/UI/StreamOutput.xib | 40 +++++++++++++++------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/modules/gui/macosx/UI/StreamOutput.xib b/modules/gui/macosx/UI/StreamOutput.xib index a6851a4d41..e1ee2411d9 100644 --- a/modules/gui/macosx/UI/StreamOutput.xib +++ b/modules/gui/macosx/UI/StreamOutput.xib @@ -1,9 +1,9 @@ <?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" customObjectInstantitationMethod="direct"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> <dependencies> - <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> - <capability name="box content view" minToolsVersion="7.0"/> + <deployment identifier="macosx"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="VLCOutput"> @@ -98,7 +98,7 @@ DQ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <font key="font" metaFont="smallSystem"/> </buttonCell> - <buttonCell type="radio" title="Stream" imagePosition="left" alignment="left" controlSize="small" lineBreakMode="charWrapping" state="on" inset="2" id="bLw-gT-7G5"> + <buttonCell type="radio" title="Stream" imagePosition="left" alignment="left" controlSize="small" lineBreakMode="charWrapping" inset="2" id="bLw-gT-7G5"> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <font key="font" metaFont="smallSystem"/> </buttonCell> @@ -146,7 +146,7 @@ DQ <rect key="frame" x="207" y="50" width="151" height="19"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="8Od-oU-Zg1"> <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> @@ -154,7 +154,7 @@ DQ <rect key="frame" x="431" y="50" width="50" height="19"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="1234" drawsBackground="YES" id="u8D-ZB-t1Z"> <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> <connections> @@ -175,7 +175,7 @@ DQ <rect key="frame" x="152" y="127" width="277" height="19"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="1X0-W0-nAb"> <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> @@ -201,7 +201,7 @@ DQ </constraints> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="1" drawsBackground="YES" id="zYS-cy-Z74"> <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> @@ -320,8 +320,6 @@ DQ <constraints> <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="520" id="D3Q-zA-BON"/> </constraints> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box horizontalHuggingPriority="750" verticalHuggingPriority="750" title="Transcode Options" translatesAutoresizingMaskIntoConstraints="NO" id="L1M-To-k82"> <rect key="frame" x="17" y="177" width="526" height="138"/> @@ -339,7 +337,7 @@ DQ <action selector="transcodeChanged:" target="-2" id="aYL-JC-6VM"/> </connections> </button> - <popUpButton horizontalHuggingPriority="240" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EOF-Z1-25K"> + <popUpButton horizontalHuggingPriority="240" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EOF-Z1-25K"> <rect key="frame" x="68" y="36" width="238" height="22"/> <popUpButtonCell key="cell" type="push" title="acodec" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" enabled="NO" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="rZZ-Re-t2d" id="ipc-AR-rgf"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -354,7 +352,7 @@ DQ <action selector="transcodeInfoChanged:" target="-2" id="b4O-P7-PhG"/> </connections> </popUpButton> - <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="HOS-pG-57A"> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" misplaced="YES" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="HOS-pG-57A"> <rect key="frame" x="341" y="41" width="76" height="14"/> <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Bitrate (kb/s):" usesSingleLineMode="YES" id="13k-Rl-3Xa"> <font key="font" metaFont="smallSystem"/> @@ -362,7 +360,7 @@ DQ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="OEl-R9-y58"> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" misplaced="YES" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="OEl-R9-y58"> <rect key="frame" x="341" y="93" width="76" height="14"/> <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Bitrate (kb/s):" usesSingleLineMode="YES" id="ec6-eo-17W"> <font key="font" metaFont="smallSystem"/> @@ -380,7 +378,7 @@ DQ <action selector="transcodeChanged:" target="-2" id="qSD-vu-K3M"/> </connections> </button> - <popUpButton horizontalHuggingPriority="240" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b49-7r-xIr"> + <popUpButton horizontalHuggingPriority="240" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="b49-7r-xIr"> <rect key="frame" x="68" y="88" width="238" height="22"/> <popUpButtonCell key="cell" type="push" title="vcodec" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" enabled="NO" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="Vl9-6Y-5fo" id="3SK-Om-qfd"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> @@ -420,7 +418,7 @@ DQ <action selector="transcodeInfoChanged:" target="-2" id="ZXj-ev-G4A"/> </connections> </comboBox> - <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="Bpf-5e-3Qe"> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" misplaced="YES" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="Bpf-5e-3Qe"> <rect key="frame" x="341" y="15" width="76" height="14"/> <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Channels" usesSingleLineMode="YES" id="0Vg-aU-iII"> <font key="font" metaFont="smallSystem"/> @@ -450,7 +448,7 @@ DQ <action selector="transcodeInfoChanged:" target="-2" id="DZx-6A-eBk"/> </connections> </comboBox> - <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="dfW-h5-9bx"> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="800" misplaced="YES" mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="dfW-h5-9bx"> <rect key="frame" x="341" y="67" width="76" height="14"/> <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Scale:" usesSingleLineMode="YES" id="V3H-q4-f5L"> <font key="font" metaFont="smallSystem"/> @@ -497,8 +495,6 @@ DQ <constraint firstItem="Soa-uy-ulr" firstAttribute="top" secondItem="sgL-Qj-BBS" secondAttribute="top" constant="15" id="yud-xz-L1M"/> </constraints> </view> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <box horizontalHuggingPriority="750" verticalHuggingPriority="750" title="Stream Announcing" translatesAutoresizingMaskIntoConstraints="NO" id="oA5-7V-7Z0" userLabel="Stream announcing box"> <rect key="frame" x="17" y="41" width="526" height="124"/> @@ -558,7 +554,7 @@ DQ <rect key="frame" x="108" y="34" width="394" height="19"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="vzf-kt-KT6"> <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> @@ -574,7 +570,7 @@ DQ <rect key="frame" x="108" y="11" width="394" height="19"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="gnV-FF-sds"> <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> @@ -606,8 +602,6 @@ DQ <constraint firstItem="PiK-Gm-63G" firstAttribute="baseline" secondItem="hlR-dz-4vC" secondAttribute="baseline" id="vvv-zZ-arD"/> </constraints> </view> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> </subviews> <constraints> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
