MacGui: disable/enable the encoder options label when needed and fix the encoder preset options when loading a queue item back to the main window.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6354 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 10 insertions, 6 deletions

diff --git a/macosx/English.lproj/Video.xib b/macosx/English.lproj/Video.xib
index 299cea6ec..e82a9bc94 100644
--- a/macosx/English.lproj/Video.xib
+++ b/macosx/English.lproj/Video.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="14A329r" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" defaultVersion="1060" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
@@ -10,6 +10,7 @@
                 <outlet property="fDisplayPresetsAdditonalOptionsLabel" destination="ijg-ux-uvb" id="Zhw-D7-xOs"/>
                 <outlet property="fDisplayPresetsAdditonalOptionsTextField" destination="oJk-ur-wgc" id="TUr-Lt-UHQ"/>
                 <outlet property="fDisplayX264PresetsUnparseTextField" destination="wk1-2U-z4i" id="aIk-h1-bOP"/>
+                <outlet property="fEncoderOptionsLabel" destination="mkM-81-g3d" id="eWq-95-kTO"/>
                 <outlet property="fFastDecodeCheck" destination="z7F-H2-Vfr" id="usU-aE-DUt"/>
                 <outlet property="fFramerateCfrCell" destination="ZRE-Ig-mhJ" id="vqQ-Pd-63o"/>
                 <outlet property="fFramerateMatrix" destination="Xe2-d5-nEH" id="GCQ-qu-zBk"/>
@@ -255,14 +256,14 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <box autoresizesSubviews="NO" verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="aeW-F6-jrd">
+                <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="aeW-F6-jrd">
                     <rect key="frame" x="20" y="41" width="880" height="5"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <font key="titleFont" metaFont="system"/>
                 </box>
-                <box autoresizesSubviews="NO" verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="NtL-8e-tS7">
+                <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="NtL-8e-tS7">
                     <rect key="frame" x="20" y="194" width="880" height="5"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
diff --git a/macosx/HBVideoController.m b/macosx/HBVideoController.m
index 5f73b566a..8545eb6c3 100644
--- a/macosx/HBVideoController.m
+++ b/macosx/HBVideoController.m
@@ -45,6 +45,8 @@ NSString *HBVideoEncoderChangedNotification = @"HBVideoEncoderChangedNotificatio
     IBOutlet NSView         *fPresetView;
     IBOutlet NSView         *fSimplePresetView;
 
+    IBOutlet NSTextField    *fEncoderOptionsLabel;
+
     /* Simple Presets Box */
     IBOutlet NSTextField    *fLavcOptionsTextField;
     IBOutlet NSTextField    *fLavcOptionsLabel;
@@ -201,6 +203,7 @@ NSString *HBVideoEncoderChangedNotification = @"HBVideoEncoderChangedNotificatio
         fVidQualitySlider,
         fVidTwoPassCheck,
         fVidTurboPassCheck,
+        fEncoderOptionsLabel,
         fPictureSettingsField,
         fPictureFiltersField
     };
@@ -281,6 +284,9 @@ NSString *HBVideoEncoderChangedNotification = @"HBVideoEncoderChangedNotificatio
     /* video encoder */
     self.codec = [queueToApply[@"JobVideoEncoderVcodec"] intValue];
 
+    /* Lets run through the following functions to get variables set there */
+    [self videoEncoderPopUpChanged:nil];
+
     /* advanced x264 options */
     if ([queueToApply[@"x264UseAdvancedOptions"] intValue])
     {
@@ -315,9 +321,6 @@ NSString *HBVideoEncoderChangedNotification = @"HBVideoEncoderChangedNotificatio
         self.lavcOptions = queueToApply[@"VideoOptionExtra"];
     }
 
-    /* Lets run through the following functions to get variables set there */
-    [self videoEncoderPopUpChanged:nil];
-
     /* Video quality */
     self.qualityType = [queueToApply[@"VideoQualityType"] intValue];