From b8237c9948f3b591f2e466e15620ef0a6a5f1bf2 Mon Sep 17 00:00:00 2001
From: Damiano Galassi <damiog@gmail.com>
Date: Sun, 7 Feb 2021 10:01:56 +0100
Subject: MacGUI: update tooltips, fixes #3240 and #3402.

---
 macosx/Base.lproj/AddPreset.xib   | 21 +++++++--------------
 macosx/Base.lproj/Preferences.xib |  8 ++++----
 2 files changed, 11 insertions(+), 18 deletions(-)

(limited to 'macosx')

diff --git a/macosx/Base.lproj/AddPreset.xib b/macosx/Base.lproj/AddPreset.xib
index 261ca7a90..715246183 100644
--- a/macosx/Base.lproj/AddPreset.xib
+++ b/macosx/Base.lproj/AddPreset.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18121" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18121"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -37,7 +37,7 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="Wpk-WC-aVk">
-                        <rect key="frame" x="18" y="97" width="92" height="14"/>
+                        <rect key="frame" x="18" y="98" width="92" height="14"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Resolution Limit:" id="75B-xq-Qbe">
                             <font key="font" metaFont="controlContent" size="11"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -140,15 +140,8 @@ Gw
                             <action selector="showSubtitlesSettingsSheet:" target="-2" id="JMG-mN-fAT"/>
                         </connections>
                     </button>
-                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="z6B-ig-ouq">
-                        <rect key="frame" x="112" y="92" width="34" height="22"/>
-                        <string key="toolTip">Picture Size controls how video dimensions are applied when selecting the preset.
-
-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>
+                    <popUpButton toolTip="Resolution Limit allows you to set a maximum width and/or height." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="z6B-ig-ouq">
+                        <rect key="frame" x="112" y="92" width="32" height="22"/>
                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="Mi7-V1-sSf">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="controlContent" size="11"/>
@@ -178,7 +171,7 @@ Source maximum uses the full dimensions of each source.</string>
                         </textFieldCell>
                     </textField>
                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bma-pS-phM">
-                        <rect key="frame" x="112" y="124" width="117" height="22"/>
+                        <rect key="frame" x="112" y="124" width="115" height="22"/>
                         <string key="toolTip">Picture Size controls how video dimensions are applied when selecting the preset.
 
 None uses the currently set dimensions.
@@ -206,7 +199,7 @@ Source maximum uses the full dimensions of each source.</string>
                         </connections>
                     </popUpButton>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="WqV-1O-lgv">
-                        <rect key="frame" x="150" y="95" width="133" height="19"/>
+                        <rect key="frame" x="148" y="95" width="133" height="19"/>
                         <subviews>
                             <textField toolTip="Maximum video storage width in pixels allowed by the preset. Set to 0 for unlimited width." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gOg-oO-8ar">
                                 <rect key="frame" x="0.0" y="0.0" width="52" height="19"/>
diff --git a/macosx/Base.lproj/Preferences.xib b/macosx/Base.lproj/Preferences.xib
index 23d7cf40f..46dd6509f 100644
--- a/macosx/Base.lproj/Preferences.xib
+++ b/macosx/Base.lproj/Preferences.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18121" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18121"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -647,7 +647,7 @@
                                 <binding destination="61" name="value" keyPath="values.HBShowSummaryPreview" id="NcJ-BV-BdB"/>
                             </connections>
                         </button>
-                        <textField toolTip="Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="qkp-nA-8ES">
+                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="qkp-nA-8ES">
                             <rect key="frame" x="77" y="56" width="184" height="14"/>
                             <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Number of simultaneous encodes:" id="iGS-b5-ip7">
                                 <font key="font" metaFont="menu" size="11"/>
@@ -655,7 +655,7 @@
                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                         </textField>
-                        <popUpButton toolTip="Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MLd-Te-AbW">
+                        <popUpButton toolTip="Higher values may help to fully utilize the CPU if a single encode can't scale to all available CPU cores." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MLd-Te-AbW">
                             <rect key="frame" x="263" y="51" width="58" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="g0s-lV-HXi"/>
-- 
cgit v1.2.3