1berry/HandBrake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac: Update Selection Behavior texts and tooltips.

Browse Source 
Some places still referenced the old Audio Defaults nomenclature.

Updates code comments so searching for selection behavior will yield audio defaults functions.
This commit is contained in:
Bradley Sepos 2017-12-04 08:28:29 -05:00
parent 931409db18
commit c448b6d3be
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
macosx/English.lproj/AddPreset.xib
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13770" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment identifier="macosx"/> <deployment identifier="macosx"/>
<development version="8000" identifier="xcode"/> <development version="8000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13770"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
<capability name="box content view" minToolsVersion="7.0"/> <capability name="box content view" minToolsVersion="7.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
@ -25,7 +25,7 @@
<window title="New Preset" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="dbZ-Wo-9nG" userLabel="AddPresetPanel"> <window title="New Preset" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="dbZ-Wo-9nG" userLabel="AddPresetPanel">
<windowStyleMask key="styleMask" titled="YES" resizable="YES"/> <windowStyleMask key="styleMask" titled="YES" resizable="YES"/>
<rect key="contentRect" x="421" y="536" width="480" height="239"/> <rect key="contentRect" x="421" y="536" width="480" height="239"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/> <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
<view key="contentView" misplaced="YES" id="AcO-9f-fnb"> <view key="contentView" misplaced="YES" id="AcO-9f-fnb">
<rect key="frame" x="0.0" y="0.0" width="480" height="239"/> <rect key="frame" x="0.0" y="0.0" width="480" height="239"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -111,9 +111,9 @@ Gw
<accessibilityConnection property="title" destination="zDq-QP-LAu" id="meT-EW-QiO"/> <accessibilityConnection property="title" destination="zDq-QP-LAu" id="meT-EW-QiO"/>
</connections> </connections>
</textField> </textField>
<button toolTip="Audio Defaults control which audio track(s) and settings are used when the preset is selected." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aez-2b-JXx"> <button toolTip="Selection Behavior determines the track(s) and settings used when the preset is selected." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aez-2b-JXx">
<rect key="frame" x="94" y="68" width="156" height="28"/> <rect key="frame" x="94" y="68" width="132" height="28"/>
<buttonCell key="cell" type="push" title="Edit Selection Behavior…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="a0j-nw-n23"> <buttonCell key="cell" type="push" title="Selection Behavior…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="a0j-nw-n23">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/> <font key="font" metaFont="smallSystem"/>
</buttonCell> </buttonCell>
@ -184,9 +184,9 @@ Gw
</constraints> </constraints>
</view> </view>
</box> </box>
<button toolTip="Subtitles Defaults control which subtitles track(s) and settings are used when the preset is selected." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nWJ-0b-fUA"> <button toolTip="Selection Behavior determines the track(s) and settings used when the preset is selected." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nWJ-0b-fUA">
<rect key="frame" x="94" y="40" width="156" height="28"/> <rect key="frame" x="94" y="40" width="132" height="28"/>
<buttonCell key="cell" type="push" title="Edit Selection Behavior…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="LPX-Rc-KLa"> <buttonCell key="cell" type="push" title="Selection Behavior…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="LPX-Rc-KLa">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/> <font key="font" metaFont="smallSystem"/>
</buttonCell> </buttonCell>
@ -240,12 +240,12 @@ None uses the currently set dimensions.
Custom allows you to set a maximum width and/or height. Custom allows you to set a maximum width and/or height.
Source maximum uses the full dimensions of each source.</string> Source maximum uses the full dimensions of each source.</string>
<popUpButtonCell key="cell" type="push" title="New Category…" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="Sf8-HP-mhE" id="mZR-uO-YA8"> <popUpButtonCell key="cell" type="push" title="New Category…" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="Sf8-HP-mhE" id="mZR-uO-YA8">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/> <font key="font" metaFont="smallSystem"/>
<menu key="menu" title="OtherViews" id="tQ1-PN-kvh"> <menu key="menu" title="OtherViews" id="tQ1-PN-kvh">
<items> <items>
<menuItem title="New Category…" id="Sf8-HP-mhE"> <menuItem title="New Category…" state="on" id="Sf8-HP-mhE">
<modifierMask key="keyEquivalentModifierMask"/> <modifierMask key="keyEquivalentModifierMask"/>
<connections> <connections>
<action selector="showNewCategoryWindow:" target="-2" id="a4V-O5-hXQ"/> <action selector="showNewCategoryWindow:" target="-2" id="a4V-O5-hXQ"/>

15
macosx/English.lproj/Preferences.xib
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13156.6" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment identifier="macosx"/> <deployment identifier="macosx"/>
<development version="8000" identifier="xcode"/> <development version="8000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13156.6"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
@ -24,7 +24,7 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES"/> <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="136" y="318" width="500" height="200"/> <rect key="contentRect" x="136" y="318" width="500" height="200"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/> <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
<value key="minSize" type="size" width="212" height="107"/> <value key="minSize" type="size" width="212" height="107"/>
<view key="contentView" id="6"> <view key="contentView" id="6">
<rect key="frame" x="0.0" y="0.0" width="500" height="200"/> <rect key="frame" x="0.0" y="0.0" width="500" height="200"/>
@ -221,7 +221,7 @@
</connections> </connections>
</popUpButton> </popUpButton>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="491"> <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="491">
<rect key="frame" x="93" y="268" width="156" height="22"/> <rect key="frame" x="93" y="268" width="155" height="22"/>
<popUpButtonCell key="cell" type="push" title="Notification" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="2" imageScaling="proportionallyDown" inset="2" selectedItem="499" id="492"> <popUpButtonCell key="cell" type="push" title="Notification" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="2" imageScaling="proportionallyDown" inset="2" selectedItem="499" id="492">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/> <font key="font" metaFont="smallSystem"/>
@ -366,9 +366,8 @@
<constraints> <constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="46" id="JL9-J5-9Pf"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="46" id="JL9-J5-9Pf"/>
</constraints> </constraints>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="fIj-Tz-ghb"> <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Note: these settings only apply to official presets. Custom presets may be configured using the Selection Behavior controls." id="fIj-Tz-ghb">
<font key="font" metaFont="smallSystem"/> <font key="font" metaFont="smallSystem"/>
<string key="title">Note: these settings only to official presets. Language selection for custom presets may be configured in the Audio Defaults settings.</string>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell> </textFieldCell>
@ -496,7 +495,7 @@
</connections> </connections>
</popUpButton> </popUpButton>
<button toolTip="Use libdvdnav to read DVDs. Only disable this for problematic DVDs where libdvdread works better (rare)." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="398"> <button toolTip="Use libdvdnav to read DVDs. Only disable this for problematic DVDs where libdvdread works better (rare)." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="398">
<rect key="frame" x="102" y="126" width="218" height="18"/> <rect key="frame" x="102" y="126" width="219" height="18"/>
<buttonCell key="cell" type="check" title="Use libdvdnav (instead of libdvdread)" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="399"> <buttonCell key="cell" type="check" title="Use libdvdnav (instead of libdvdread)" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="399">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/> <font key="font" metaFont="smallSystem"/>
@ -658,7 +657,7 @@
</connections> </connections>
</button> </button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ybi-46-yhY"> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ybi-46-yhY">
<rect key="frame" x="102" y="235" width="253" height="18"/> <rect key="frame" x="102" y="235" width="254" height="18"/>
<string key="toolTip">Show the Advanced Options Panel for x264 settings. <string key="toolTip">Show the Advanced Options Panel for x264 settings.
This setting is no longer supported and may be removed in a future version. Use at your own risk!</string> This setting is no longer supported and may be removed in a future version. Use at your own risk!</string>

2
macosx/HBAudioDefaults.h
View File

@ -19,7 +19,7 @@ typedef NS_ENUM(NSUInteger, HBAudioTrackSelectionBehavior) {
/** /**
* HBAudioSettings * HBAudioSettings
* Stores the audio defaults settings. * Stores the audio defaults (selection behavior) settings.
*/ */
@interface HBAudioDefaults : NSObject <NSSecureCoding, NSCopying, HBPresetCoding> @interface HBAudioDefaults : NSObject <NSSecureCoding, NSCopying, HBPresetCoding>

5
macosx/HBAudioTrackPreset.h
View File

@ -10,8 +10,9 @@ NS_ASSUME_NONNULL_BEGIN
/** /**
* HBAudioTrackPreset * HBAudioTrackPreset
* a KVO enabled class used in the Audio Defaults panels, * a KVO enabled class used in the Audio Defaults
* automatically validates the values. * (Selection Behavior) panels, automatically
* validates the values.
*/ */
@interface HBAudioTrackPreset : NSObject <NSSecureCoding, NSCopying> @interface HBAudioTrackPreset : NSObject <NSSecureCoding, NSCopying>

2
macosx/HBJob+HBJobConversion.m
View File

@ -316,7 +316,7 @@
} }
} }
// Audio Defaults // Audio Defaults (Selection Behavior)
job->acodec_copy_mask = 0; job->acodec_copy_mask = 0;
HBAudioDefaults *audioDefaults = self.audio.defaults; HBAudioDefaults *audioDefaults = self.audio.defaults;