summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--macosx/English.lproj/AddPreset.xib22
-rw-r--r--macosx/English.lproj/Preferences.xib15
-rw-r--r--macosx/HBAudioDefaults.h2
-rw-r--r--macosx/HBAudioTrackPreset.h5
-rw-r--r--macosx/HBJob+HBJobConversion.m2
5 files changed, 23 insertions, 23 deletions
diff --git a/macosx/English.lproj/AddPreset.xib b/macosx/English.lproj/AddPreset.xib
index 4cf65c9bf..5e71758d7 100644
--- a/macosx/English.lproj/AddPreset.xib
+++ b/macosx/English.lproj/AddPreset.xib
@@ -1,9 +1,9 @@
<?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>
<deployment identifier="macosx"/>
<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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</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">
<windowStyleMask key="styleMask" titled="YES" resizable="YES"/>
<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">
<rect key="frame" x="0.0" y="0.0" width="480" height="239"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -111,9 +111,9 @@ Gw
<accessibilityConnection property="title" destination="zDq-QP-LAu" id="meT-EW-QiO"/>
</connections>
</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">
- <rect key="frame" x="94" y="68" width="156" 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">
+ <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="132" height="28"/>
+ <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"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
@@ -184,9 +184,9 @@ Gw
</constraints>
</view>
</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">
- <rect key="frame" x="94" y="40" width="156" 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">
+ <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="132" height="28"/>
+ <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"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
@@ -240,12 +240,12 @@ None uses the currently set dimensions.
Custom allows you to set a maximum width and/or height.
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"/>
<font key="font" metaFont="smallSystem"/>
<menu key="menu" title="OtherViews" id="tQ1-PN-kvh">
<items>
- <menuItem title="New Category…" id="Sf8-HP-mhE">
+ <menuItem title="New Category…" state="on" id="Sf8-HP-mhE">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="showNewCategoryWindow:" target="-2" id="a4V-O5-hXQ"/>
diff --git a/macosx/English.lproj/Preferences.xib b/macosx/English.lproj/Preferences.xib
index 1965ad067..f23c35118 100644
--- a/macosx/English.lproj/Preferences.xib
+++ b/macosx/English.lproj/Preferences.xib
@@ -1,9 +1,9 @@
<?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>
<deployment identifier="macosx"/>
<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"/>
</dependencies>
<objects>
@@ -24,7 +24,7 @@
<windowStyleMask key="styleMask" titled="YES" closable="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="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"/>
<view key="contentView" id="6">
<rect key="frame" x="0.0" y="0.0" width="500" height="200"/>
@@ -221,7 +221,7 @@
</connections>
</popUpButton>
<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">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -366,9 +366,8 @@
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="46" id="JL9-J5-9Pf"/>
</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"/>
- <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="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -496,7 +495,7 @@
</connections>
</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">
- <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">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -658,7 +657,7 @@
</connections>
</button>
<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.
This setting is no longer supported and may be removed in a future version. Use at your own risk!</string>
diff --git a/macosx/HBAudioDefaults.h b/macosx/HBAudioDefaults.h
index 8d3c1a8f3..58f4e39bc 100644
--- a/macosx/HBAudioDefaults.h
+++ b/macosx/HBAudioDefaults.h
@@ -19,7 +19,7 @@ typedef NS_ENUM(NSUInteger, HBAudioTrackSelectionBehavior) {
/**
* HBAudioSettings
- * Stores the audio defaults settings.
+ * Stores the audio defaults (selection behavior) settings.
*/
@interface HBAudioDefaults : NSObject <NSSecureCoding, NSCopying, HBPresetCoding>
diff --git a/macosx/HBAudioTrackPreset.h b/macosx/HBAudioTrackPreset.h
index bfb88a904..09208f890 100644
--- a/macosx/HBAudioTrackPreset.h
+++ b/macosx/HBAudioTrackPreset.h
@@ -10,8 +10,9 @@ NS_ASSUME_NONNULL_BEGIN
/**
* HBAudioTrackPreset
- * a KVO enabled class used in the Audio Defaults panels,
- * automatically validates the values.
+ * a KVO enabled class used in the Audio Defaults
+ * (Selection Behavior) panels, automatically
+ * validates the values.
*/
@interface HBAudioTrackPreset : NSObject <NSSecureCoding, NSCopying>
diff --git a/macosx/HBJob+HBJobConversion.m b/macosx/HBJob+HBJobConversion.m
index e67f39cf8..9895a3adc 100644
--- a/macosx/HBJob+HBJobConversion.m
+++ b/macosx/HBJob+HBJobConversion.m
@@ -316,7 +316,7 @@
}
}
- // Audio Defaults
+ // Audio Defaults (Selection Behavior)
job->acodec_copy_mask = 0;
HBAudioDefaults *audioDefaults = self.audio.defaults;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 16:14:11 +0000