diff options
author | Damiano Galassi <[email protected]> | 2016-07-16 12:02:27 +0200 |
---|---|---|
committer | Damiano Galassi <[email protected]> | 2016-07-16 12:02:27 +0200 |
commit | aca48f3c89ef65a6a5d06fe453c779964fe69a57 (patch) | |
tree | d89b26e5a4a0bea34a213145b86d5b08ab73adc5 /macosx | |
parent | 940771142e772bb737c7bd70f96d05c24206e39f (diff) |
MacGui: fix the label color of two text labels in the preview HUD on 10.9 and earlier.
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/HBPictureHUDController.m | 5 | ||||
-rw-r--r-- | macosx/HBPictureHUDController.xib | 17 |
2 files changed, 19 insertions, 3 deletions
diff --git a/macosx/HBPictureHUDController.m b/macosx/HBPictureHUDController.m index 741e6d008..86ccbe3e0 100644 --- a/macosx/HBPictureHUDController.m +++ b/macosx/HBPictureHUDController.m @@ -16,6 +16,9 @@ @property (weak) IBOutlet NSPopUpButton *durationPopUp; @property (weak) IBOutlet NSButton *scaleToScreenButton; +@property (weak) IBOutlet NSTextField *durationLabel; +@property (weak) IBOutlet NSTextField *durationUnitLabel; + @property (nonatomic) BOOL fitToView; @end @@ -35,6 +38,8 @@ { self.scaleLabel.textColor = [NSColor whiteColor]; self.infoLabel.textColor = [NSColor whiteColor]; + self.durationLabel.textColor = [NSColor whiteColor]; + self.durationUnitLabel.textColor = [NSColor whiteColor]; } // we set the preview length popup in seconds diff --git a/macosx/HBPictureHUDController.xib b/macosx/HBPictureHUDController.xib index 900e10e73..22da3ff17 100644 --- a/macosx/HBPictureHUDController.xib +++ b/macosx/HBPictureHUDController.xib @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G12a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11129.15" systemVersion="15G26a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <deployment identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11129.15"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="HBPictureHUDController"> <connections> + <outlet property="durationLabel" destination="5T3-Vx-mC1" id="5eW-sk-KvC"/> <outlet property="durationPopUp" destination="ASA-X8-16P" id="Ti4-aX-nbp"/> + <outlet property="durationUnitLabel" destination="Vrm-He-CjP" id="dvz-XA-oWy"/> <outlet property="infoLabel" destination="MkW-KN-I1h" id="c2A-DS-cd1"/> <outlet property="scaleLabel" destination="7UR-Zz-7iX" id="ukS-8e-xmA"/> <outlet property="scaleToScreenButton" destination="12K-c3-Z7A" id="ISw-XG-Wg8"/> @@ -23,6 +25,7 @@ <subviews> <button toolTip="Encode And Play Back A Live Preview At Your Current Settings" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="16b-R9-bBU"> <rect key="frame" x="17" y="11" width="80" height="16"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="push" title="Live Preview" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="vkh-GY-5qx"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="miniSystem"/> @@ -33,6 +36,7 @@ </button> <button toolTip="Show Picture Settings Inspector" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mV7-hU-tMt"> <rect key="frame" x="378" y="11" width="61" height="16"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="push" title="Settings" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="NWd-Lq-c1A"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="miniSystem"/> @@ -43,6 +47,7 @@ </button> <button toolTip="Scale Preview To Screen" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="12K-c3-Z7A"> <rect key="frame" x="276" y="11" width="96" height="16"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="push" title="Scale To Screen" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="STc-Po-p1X"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="miniSystem"/> @@ -53,6 +58,7 @@ </button> <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5T3-Vx-mC1"> <rect key="frame" x="105" y="14" width="48" height="11"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Duration:" id="USR-Qf-N5v"> <font key="font" metaFont="miniSystemBold"/> <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/> @@ -61,6 +67,7 @@ </textField> <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vrm-He-CjP"> <rect key="frame" x="215" y="14" width="21" height="11"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="sec" id="ksF-Ma-hB1"> <font key="font" metaFont="miniSystemBold"/> <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/> @@ -69,6 +76,7 @@ </textField> <popUpButton toolTip="Select The Length Of Live Preview to Encode" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ASA-X8-16P"> <rect key="frame" x="158" y="12" width="53" height="15"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <popUpButtonCell key="cell" type="push" title="240" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="XYh-Ls-slf" id="yDS-gf-Y4N"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="miniSystem"/> @@ -84,6 +92,7 @@ </popUpButton> <slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wUk-SQ-GhS"> <rect key="frame" x="18" y="39" width="420" height="17"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <sliderCell key="cell" controlSize="mini" continuous="YES" alignment="left" maxValue="9" tickMarkPosition="above" numberOfTickMarks="10" allowsTickMarkValuesOnly="YES" sliderType="linear" id="dPk-jb-w9o"> <font key="font" metaFont="miniSystem"/> </sliderCell> @@ -93,6 +102,7 @@ </slider> <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="426" translatesAutoresizingMaskIntoConstraints="NO" id="MkW-KN-I1h"> <rect key="frame" x="15" y="55" width="430" height="20"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="DKr-Lp-f2U"> <font key="font" metaFont="smallSystemBold"/> <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> @@ -101,6 +111,7 @@ </textField> <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="422" translatesAutoresizingMaskIntoConstraints="NO" id="7UR-Zz-7iX"> <rect key="frame" x="15" y="77" width="426" height="12"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" id="CeL-Pu-NS6"> <font key="font" metaFont="miniSystemBold"/> <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/> @@ -108,7 +119,7 @@ </textFieldCell> </textField> </subviews> - <point key="canvasLocation" x="444" y="476"/> + <point key="canvasLocation" x="183" y="165"/> </customView> </objects> </document> |