vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sun Apr 15 18:25:20 2018 +0200| [2f27b7f9c75c935e518b7716f7a3c0680d58649c] | committer: David Fuhrmann
macosx: Fix localization issues in effects panels The "apply at next startup" box did not have a localization at all. The tab views localication was not applied correctly to due to the panels redesign. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2f27b7f9c75c935e518b7716f7a3c0680d58649c --- modules/gui/macosx/UI/AudioEffects.xib | 18 +++--- modules/gui/macosx/UI/CoreDialogs.xib | 2 +- modules/gui/macosx/UI/VideoEffects.xib | 68 +++++++++++----------- .../gui/macosx/VLCAudioEffectsWindowController.h | 2 +- .../gui/macosx/VLCAudioEffectsWindowController.m | 10 ++-- .../gui/macosx/VLCVideoEffectsWindowController.h | 2 +- .../gui/macosx/VLCVideoEffectsWindowController.m | 13 ++--- 7 files changed, 58 insertions(+), 57 deletions(-) diff --git a/modules/gui/macosx/UI/AudioEffects.xib b/modules/gui/macosx/UI/AudioEffects.xib index db98ffec56..6258bd8a91 100644 --- a/modules/gui/macosx/UI/AudioEffects.xib +++ b/modules/gui/macosx/UI/AudioEffects.xib @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="17E199" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> <capability name="box content view" minToolsVersion="7.0"/> </dependencies> <objects> @@ -57,6 +57,7 @@ <outlet property="filterScaleTempoCheckbox" destination="wYr-HG-zA2" id="Io2-dE-xoC"/> <outlet property="filterStereoEnhancerCheckbox" destination="NUi-0U-gqN" id="aym-ex-fgv"/> <outlet property="profilePopup" destination="701" id="fL3-Nz-1t7"/> + <outlet property="segmentView" destination="Jb1-f1-iF3" id="w66-bc-QSP"/> <outlet property="spatializerBand1Label" destination="277" id="pg6-1P-KW1"/> <outlet property="spatializerBand1Slider" destination="266" id="Cdn-mQ-kxW"/> <outlet property="spatializerBand1TextField" destination="265" id="Zi8-go-4Ct"/> @@ -75,7 +76,6 @@ <outlet property="spatializerEnableCheckbox" destination="262" id="AvT-xk-v5G"/> <outlet property="spatializerResetButton" destination="618" id="QQk-Ff-tSR"/> <outlet property="spatializerView" destination="725" id="ndp-B1-7e4"/> - <outlet property="tabView" destination="80" id="Wst-uc-Vlp"/> <outlet property="window" destination="1" id="SPr-ur-9uw"/> </connections> </customObject> @@ -91,7 +91,7 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jb1-f1-iF3"> - <rect key="frame" x="80" y="254" width="314" height="24"/> + <rect key="frame" x="72" y="254" width="330" height="24"/> <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="ZdJ-0F-LWH"> <font key="font" metaFont="system"/> <segments> @@ -503,7 +503,7 @@ </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="621"> <rect key="frame" x="424" y="190" width="39" height="17"/> - <buttonCell key="cell" type="roundRect" title="Reset" bezelStyle="roundedRect" image="buttonCell:622:image" imagePosition="overlaps" alignment="center" controlSize="mini" borderStyle="border" inset="2" id="622"> + <buttonCell key="cell" type="roundRect" title="Reset" bezelStyle="roundedRect" image="DBA9FF77-3F58-444F-902A-249EA5A23E3A" imagePosition="overlaps" alignment="center" controlSize="mini" borderStyle="border" inset="2" id="622"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="miniSystem"/> </buttonCell> @@ -790,7 +790,7 @@ </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="618"> <rect key="frame" x="424" y="190" width="39" height="17"/> - <buttonCell key="cell" type="roundRect" title="Reset" bezelStyle="roundedRect" image="buttonCell:619:image" imagePosition="overlaps" alignment="center" controlSize="mini" borderStyle="border" inset="2" id="619"> + <buttonCell key="cell" type="roundRect" title="Reset" bezelStyle="roundedRect" image="D57F690C-D42D-46B8-B0D9-BA04207B8D4D" imagePosition="overlaps" alignment="center" controlSize="mini" borderStyle="border" inset="2" id="619"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="miniSystem"/> </buttonCell> @@ -1017,7 +1017,7 @@ <action selector="filterEnableVolumeNorm:" target="-2" id="TN6-b4-Vnj"/> </connections> </button> - <box borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="727"> + <box title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="727"> <rect key="frame" x="16" y="146" width="440" height="36"/> <view key="contentView" id="eB4-KX-Qdy"> <rect key="frame" x="1" y="1" width="438" height="34"/> @@ -1168,7 +1168,7 @@ <userDefaultsController representsSharedInstance="YES" id="350"/> </objects> <resources> - <image name="buttonCell:619:image" width="1" height="1"> + <image name="D57F690C-D42D-46B8-B0D9-BA04207B8D4D" width="1" height="1"> <mutableData key="keyedArchiveRepresentation"> YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw @@ -1209,7 +1209,7 @@ ALkAuwDAANcA2QDbBysHMAc7B0QHVwdbB2YHbwd0B3wHfweEB5MHlweeB6YHswe4B7oHvAfBB8kHzAfR B9kH3AfuB/EH9gAAAAAAAAIBAAAAAAAAAEEAAAAAAAAAAAAAAAAAAAf4A </mutableData> </image> - <image name="buttonCell:622:image" width="1" height="1"> + <image name="DBA9FF77-3F58-444F-902A-249EA5A23E3A" width="1" height="1"> <mutableData key="keyedArchiveRepresentation"> YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw diff --git a/modules/gui/macosx/UI/CoreDialogs.xib b/modules/gui/macosx/UI/CoreDialogs.xib index 7137107ce4..5a7eaddd0c 100644 --- a/modules/gui/macosx/UI/CoreDialogs.xib +++ b/modules/gui/macosx/UI/CoreDialogs.xib @@ -1,5 +1,5 @@ <?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"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="17E199" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <development version="7000" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> diff --git a/modules/gui/macosx/UI/VideoEffects.xib b/modules/gui/macosx/UI/VideoEffects.xib index 5f752bd3b8..2ceae4cb61 100644 --- a/modules/gui/macosx/UI/VideoEffects.xib +++ b/modules/gui/macosx/UI/VideoEffects.xib @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="17E199" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> <capability name="box content view" minToolsVersion="7.0"/> </dependencies> <objects> @@ -85,6 +85,7 @@ <outlet property="puzzleRowsLabel" destination="142" id="XLw-Ah-BhG"/> <outlet property="puzzleRowsStepper" destination="140" id="JrW-XG-5fu"/> <outlet property="puzzleRowsTextField" destination="138" id="xun-HA-Tf4"/> + <outlet property="segmentView" destination="PmS-HT-UdA" id="KXj-v2-bjs"/> <outlet property="sepiaCheckbox" destination="242" id="rgt-O0-CQl"/> <outlet property="sepiaLabel" destination="244" id="0E7-rS-dgl"/> <outlet property="sepiaStepper" destination="245" id="wUp-jU-PrZ"/> @@ -92,7 +93,6 @@ <outlet property="sharpenCheckbox" destination="58" id="C4Q-3x-usz"/> <outlet property="sharpenLabel" destination="54" id="LIq-VH-mIA"/> <outlet property="sharpenSlider" destination="53" id="69B-oE-hwo"/> - <outlet property="tabView" destination="3" id="JdL-Q0-Det"/> <outlet property="thresholdCheckbox" destination="271" id="DEO-tF-Qiu"/> <outlet property="thresholdColorLabel" destination="292" id="ndo-6J-dNT"/> <outlet property="thresholdColorTextField" destination="293" id="AkS-0h-iLI"/> @@ -127,7 +127,7 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PmS-HT-UdA"> - <rect key="frame" x="204" y="265" width="352" height="24"/> + <rect key="frame" x="194" y="265" width="372" height="24"/> <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="l7E-0O-cd7"> <font key="font" metaFont="system"/> <segments> @@ -148,7 +148,7 @@ <constraint firstAttribute="height" constant="1" id="La9-tY-5he"/> </constraints> </box> - <tabView drawsBackground="NO" type="noTabsNoBorder" translatesAutoresizingMaskIntoConstraints="NO" id="3"> + <tabView drawsBackground="NO" type="noTabsNoBorder" initialItem="4" translatesAutoresizingMaskIntoConstraints="NO" id="3"> <rect key="frame" x="0.0" y="35" width="755" height="216"/> <font key="font" metaFont="system"/> <tabViewItems> @@ -157,7 +157,7 @@ <rect key="frame" x="0.0" y="0.0" width="755" height="216"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <box borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="48"> + <box title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="48"> <rect key="frame" x="8" y="32" width="369" height="166"/> <view key="contentView" id="wwn-Le-8VF"> <rect key="frame" x="1" y="1" width="367" height="164"/> @@ -204,7 +204,7 @@ </connections> </slider> <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="46"> - <rect key="frame" x="175" y="73" width="135" height="18"/> + <rect key="frame" x="175" y="73" width="134" height="18"/> <buttonCell key="cell" type="check" title="Brightness Threshold" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="47"> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <font key="font" metaFont="smallSystem"/> @@ -320,7 +320,7 @@ <action selector="enableSharpen:" target="-2" id="hMo-bi-uqx"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="57"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="57"> <rect key="frame" x="379" y="156" width="368" height="42"/> <view key="contentView" id="XDn-1w-i62"> <rect key="frame" x="1" y="1" width="366" height="40"/> @@ -364,7 +364,7 @@ <action selector="enableBanding:" target="-2" id="qkS-Sl-QqY"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="61"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="61"> <rect key="frame" x="379" y="94" width="368" height="42"/> <view key="contentView" id="ppw-UH-GKm"> <rect key="frame" x="1" y="1" width="366" height="40"/> @@ -408,7 +408,7 @@ <action selector="enableGrain:" target="-2" id="dLd-Zu-eFG"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="68"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="68"> <rect key="frame" x="379" y="32" width="368" height="42"/> <view key="contentView" id="xSw-Z6-2rH"> <rect key="frame" x="1" y="1" width="366" height="40"/> @@ -697,7 +697,7 @@ <action selector="enableZoom:" target="-2" id="hEF-sf-KtP"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="117"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="117"> <rect key="frame" x="8" y="153" width="369" height="46"/> <view key="contentView" id="3KQ-fd-kER"> <rect key="frame" x="1" y="1" width="367" height="44"/> @@ -741,7 +741,7 @@ <action selector="enablePuzzle:" target="-2" id="yT9-tI-VZc"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="124"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="124"> <rect key="frame" x="379" y="125" width="368" height="74"/> <view key="contentView" id="HUd-nt-fzr"> <rect key="frame" x="1" y="1" width="366" height="72"/> @@ -850,7 +850,7 @@ <action selector="enableWall:" target="-2" id="pHR-DP-Yje"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="755"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="755"> <rect key="frame" x="8" y="31" width="369" height="74"/> <view key="contentView" id="ne3-lY-k8h"> <rect key="frame" x="1" y="1" width="367" height="72"/> @@ -963,7 +963,7 @@ <action selector="enableClone:" target="-2" id="S7F-h8-33g"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="730"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="730"> <rect key="frame" x="379" y="58" width="368" height="47"/> <view key="contentView" id="uom-ff-xWb"> <rect key="frame" x="1" y="1" width="366" height="45"/> @@ -1065,7 +1065,7 @@ <action selector="enableThreshold:" target="-2" id="EXx-Au-HPF"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="272" userLabel="Color Box"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="272" userLabel="Color Box"> <rect key="frame" x="8" y="87" width="245" height="112"/> <view key="contentView" id="VxL-14-NoR"> <rect key="frame" x="1" y="1" width="243" height="110"/> @@ -1155,7 +1155,7 @@ <action selector="enableSepia:" target="-2" id="f8B-Kt-uqG"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="243" userLabel="Sepia Box"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="243" userLabel="Sepia Box"> <rect key="frame" x="8" y="23" width="245" height="47"/> <view key="contentView" id="3iv-gg-bsG"> <rect key="frame" x="1" y="1" width="243" height="45"/> @@ -1224,7 +1224,7 @@ <action selector="enableGradient:" target="-2" id="Lxe-qa-iOE"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="203" userLabel="Gradient Box"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="203" userLabel="Gradient Box"> <rect key="frame" x="255" y="87" width="244" height="112"/> <view key="contentView" id="q62-YN-hEA"> <rect key="frame" x="1" y="1" width="242" height="110"/> @@ -1312,7 +1312,7 @@ <action selector="enableExtract:" target="-2" id="BTh-5r-NvI"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="279" userLabel="Extraction Box"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="279" userLabel="Extraction Box"> <rect key="frame" x="255" y="23" width="244" height="47"/> <view key="contentView" id="hin-eg-GKX"> <rect key="frame" x="1" y="1" width="242" height="45"/> @@ -1373,7 +1373,7 @@ <action selector="enablePosterize:" target="-2" id="1nY-6G-Qz1"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="207" userLabel="Posterize Box"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="207" userLabel="Posterize Box"> <rect key="frame" x="501" y="152" width="245" height="47"/> <view key="contentView" id="s4h-VJ-0fi"> <rect key="frame" x="1" y="1" width="243" height="45"/> @@ -1442,7 +1442,7 @@ <action selector="enableBlur:" target="-2" id="ofo-zv-aYJ"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="218" userLabel="Blur Box"> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="218" userLabel="Blur Box"> <rect key="frame" x="501" y="87" width="245" height="47"/> <view key="contentView" id="zp9-ZY-iRy"> <rect key="frame" x="1" y="1" width="243" height="45"/> @@ -1572,7 +1572,7 @@ </tabViewItem> <tabViewItem label="Miscellaneous" identifier="misc" id="12"> <view key="view" id="13"> - <rect key="frame" x="0.0" y="0.0" width="716" height="216"/> + <rect key="frame" x="0.0" y="0.0" width="755" height="216"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="302"> @@ -1585,14 +1585,14 @@ <action selector="enableAddText:" target="-2" id="9eK-f2-5u9"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="303"> - <rect key="frame" x="8" y="126" width="346" height="72"/> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="303"> + <rect key="frame" x="8" y="126" width="366" height="72"/> <view key="contentView" id="0S4-qU-SrJ"> - <rect key="frame" x="1" y="1" width="344" height="70"/> + <rect key="frame" x="1" y="1" width="364" height="70"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="307"> - <rect key="frame" x="15" y="42" width="27" height="14"/> + <rect key="frame" x="15" y="42" width="26" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Text" id="315"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -1608,7 +1608,7 @@ </textFieldCell> </textField> <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="325"> - <rect key="frame" x="139" y="10" width="190" height="22"/> + <rect key="frame" x="159" y="10" width="190" height="22"/> <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="328" id="326"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="smallSystem"/> @@ -1625,7 +1625,7 @@ </connections> </popUpButton> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="331"> - <rect key="frame" x="142" y="39" width="184" height="19"/> + <rect key="frame" x="162" y="39" width="184" height="19"/> <constraints> <constraint firstAttribute="width" constant="184" id="fsZ-s4-l8b"/> </constraints> @@ -1656,7 +1656,7 @@ </constraints> </box> <button mirrorLayoutDirectionWhenInternationalizing="always" translatesAutoresizingMaskIntoConstraints="NO" id="643"> - <rect key="frame" x="358" y="197" width="69" height="18"/> + <rect key="frame" x="378" y="197" width="69" height="18"/> <buttonCell key="cell" type="check" title="Add logo" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="667"> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <font key="font" metaFont="smallSystem"/> @@ -1665,10 +1665,10 @@ <action selector="enableAddLogo:" target="-2" id="mbp-aI-eNo"/> </connections> </button> - <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="644"> - <rect key="frame" x="358" y="104" width="346" height="95"/> + <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="644"> + <rect key="frame" x="378" y="104" width="365" height="95"/> <view key="contentView" id="4L0-QJ-InP"> - <rect key="frame" x="1" y="1" width="344" height="93"/> + <rect key="frame" x="1" y="1" width="363" height="93"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="652"> @@ -1696,7 +1696,7 @@ </textFieldCell> </textField> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="646"> - <rect key="frame" x="140" y="62" width="184" height="19"/> + <rect key="frame" x="159" y="62" width="184" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" id="665"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -1707,14 +1707,14 @@ </connections> </textField> <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="645"> - <rect key="frame" x="140" y="11" width="184" height="15"/> + <rect key="frame" x="159" y="11" width="184" height="15"/> <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="255" doubleValue="255" tickMarkPosition="above" sliderType="linear" id="666"/> <connections> <action selector="addLogoModifierChanged:" target="-2" id="zDd-CQ-Txa"/> </connections> </slider> <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="692"> - <rect key="frame" x="137" y="32" width="190" height="22"/> + <rect key="frame" x="156" y="32" width="190" height="22"/> <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="697" id="693"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="smallSystem"/> diff --git a/modules/gui/macosx/VLCAudioEffectsWindowController.h b/modules/gui/macosx/VLCAudioEffectsWindowController.h index ead4d711c4..03dacbf0e7 100644 --- a/modules/gui/macosx/VLCAudioEffectsWindowController.h +++ b/modules/gui/macosx/VLCAudioEffectsWindowController.h @@ -30,7 +30,7 @@ @interface VLCAudioEffectsWindowController : NSWindowController /* generic */ -@property (readwrite, weak) IBOutlet NSTabView *tabView; +@property (readwrite, weak) IBOutlet NSSegmentedControl *segmentView; @property (readwrite, weak) IBOutlet NSPopUpButton *profilePopup; @property (readwrite, weak) IBOutlet NSButton *applyProfileCheckbox; diff --git a/modules/gui/macosx/VLCAudioEffectsWindowController.m b/modules/gui/macosx/VLCAudioEffectsWindowController.m index ae91698ba7..08543a170f 100644 --- a/modules/gui/macosx/VLCAudioEffectsWindowController.m +++ b/modules/gui/macosx/VLCAudioEffectsWindowController.m @@ -208,6 +208,7 @@ - (void)windowDidLoad { [_applyProfileCheckbox setState:[[NSUserDefaults standardUserDefaults] boolForKey:@"AudioEffectApplyProfileOnStartup"]]; + [_applyProfileCheckbox setTitle:_NS("Apply profile at next launch")]; /* setup the user's language */ /* Equalizer */ @@ -267,10 +268,11 @@ "thereby widening the stereo effect.")]; /* generic */ - [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"equalizer"]] setLabel:_NS("Equalizer")]; - [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"compressor"]] setLabel:_NS("Compressor")]; - [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"spatializer"]] setLabel:_NS("Spatializer")]; - [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"filter"]] setLabel:_NS("Filter")]; + [_segmentView setLabel:_NS("Equalizer") forSegment:0]; + [_segmentView setLabel:_NS("Compressor") forSegment:1]; + [_segmentView setLabel:_NS("Spatializer") forSegment:2]; + [_segmentView setLabel:_NS("Filter") forSegment:3]; + [self.window setTitle:_NS("Audio Effects")]; [self.window setExcludedFromWindowsMenu:YES]; [self.window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary]; diff --git a/modules/gui/macosx/VLCVideoEffectsWindowController.h b/modules/gui/macosx/VLCVideoEffectsWindowController.h index f09a5ada2a..1954ab84aa 100644 --- a/modules/gui/macosx/VLCVideoEffectsWindowController.h +++ b/modules/gui/macosx/VLCVideoEffectsWindowController.h @@ -29,7 +29,7 @@ @interface VLCVideoEffectsWindowController : NSWindowController /* generic */ -@property (readwrite, weak) IBOutlet NSTabView *tabView; +@property (readwrite, weak) IBOutlet NSSegmentedControl *segmentView; @property (readwrite, weak) IBOutlet NSPopUpButton *profilePopup; @property (readwrite, weak) IBOutlet NSButton *applyProfileCheckbox; diff --git a/modules/gui/macosx/VLCVideoEffectsWindowController.m b/modules/gui/macosx/VLCVideoEffectsWindowController.m index 80da1df8a7..8c976222df 100644 --- a/modules/gui/macosx/VLCVideoEffectsWindowController.m +++ b/modules/gui/macosx/VLCVideoEffectsWindowController.m @@ -189,13 +189,14 @@ [self.window setExcludedFromWindowsMenu:YES]; [self.window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary]; - [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"basic"]] setLabel:_NS("Basic")]; - [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"crop"]] setLabel:_NS("Crop")]; - [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"geometry"]] setLabel:_NS("Geometry")]; - [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"color"]] setLabel:_NS("Color")]; - [[_tabView tabViewItemAtIndex:[_tabView indexOfTabViewItemWithIdentifier:@"misc"]] setLabel:_NS("Miscellaneous")]; + [_segmentView setLabel:_NS("Basic") forSegment:0]; + [_segmentView setLabel:_NS("Crop") forSegment:1]; + [_segmentView setLabel:_NS("Geometry") forSegment:2]; + [_segmentView setLabel:_NS("Color") forSegment:3]; + [_segmentView setLabel:_NS("Miscellaneous") forSegment:4]; [_applyProfileCheckbox setState:[[NSUserDefaults standardUserDefaults] boolForKey:@"VideoEffectApplyProfileOnStartup"]]; + [_applyProfileCheckbox setTitle:_NS("Apply profile at next launch")]; [self resetProfileSelector]; @@ -327,8 +328,6 @@ [[_addLogoPositionPopup lastItem] setTag: 10]; [_addLogoTransparencyLabel setStringValue:_NS("Transparency")]; - [_tabView selectFirstTabViewItem:self]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(inputChangedEvent:) name:VLCInputChangedNotification _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
