MacGui: Advanced Tab only shows x264 opt widgets when x264 is selected as the codec. Otherwise, displays a message to that effect.

- Put the x264 options in a custom NSView which hides it and its contents unless x264 is selected
- add field at the top to show the status of the Advanced Tabs contents which is triggered in the - CodecsPopUpChanged method.

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

5 files changed, 33 insertions, 11 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 1ed6f1697..d8f208abe 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -135,12 +135,22 @@
     IBOutlet NSButton            * fPauseButton;
     IBOutlet NSButton            * fRipButton;
 
-	/* Advanced Tab for opts */
+	/* Advanced Tab for opts fX264optView*/
+	IBOutlet NSView              * fX264optView;
+	IBOutlet NSTextField         * fX264optViewTitleLabel;
+	IBOutlet NSTextField         * fDisplayX264OptionsLabel;
+	IBOutlet NSTextField         * fDisplayX264Options;
+	IBOutlet NSTextField         * fX264optBframesLabel;
 	IBOutlet NSPopUpButton       * fX264optBframesPopUp;
+	IBOutlet NSTextField         * fX264optRefLabel;
 	IBOutlet NSPopUpButton       * fX264optRefPopUp;
+	IBOutlet NSTextField         * fX264optNfpskipLabel;
 	IBOutlet NSPopUpButton       * fX264optNfpskipPopUp;
+	IBOutlet NSTextField         * fX264optNodctdcmtLabel;
 	IBOutlet NSPopUpButton       * fX264optNodctdcmtPopUp;
+	IBOutlet NSTextField         * fX264optSubmeLabel;
 	IBOutlet NSPopUpButton       * fX264optSubmePopUp;
+	IBOutlet NSTextField         * fX264optTrellisLabel;
 	IBOutlet NSPopUpButton       * fX264optTrellisPopUp;
 
 	/* User Preset variables here fPresetNewPicSettingsApply*/
@@ -149,8 +159,6 @@
 	IBOutlet NSTextField         * fPresetNewName;
 	IBOutlet NSPopUpButton       * fPresetNewPicSettingsPopUp;
 	IBOutlet NSTextField         * fPresetSelectedDisplay;
-	IBOutlet NSTextField         * fDisplayX264OptionsLabel;
-	IBOutlet NSTextField         * fDisplayX264Options;
 	
 	NSString                     * AppSupportDirectory;
 	NSString                     * UserPresetsFile;
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 8c96945c5..1238d468a 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -645,7 +645,10 @@ return registrationDictionary;
 		fPicLabelAr,fPicLabelDeinter,fPicLabelSrcX,fPicLabelOutputX,
 		fPicLabelPAROutp,fPicLabelPAROutputX,fPicSettingPARWidth,fPicSettingPARHeight,
 		fPicSettingPARDsply,fPicLabelAnamorphic,tableView,fPresetsAdd,fPresetsDelete,
-		fCreateChapterMarkers,fDisplayX264Options,fDisplayX264OptionsLabel};
+		fCreateChapterMarkers,fX264optViewTitleLabel,fDisplayX264Options,fDisplayX264OptionsLabel,fX264optBframesLabel,
+		fX264optBframesPopUp,fX264optRefLabel,fX264optRefPopUp,fX264optNfpskipLabel,fX264optNfpskipPopUp,
+		fX264optNodctdcmtLabel,fX264optNodctdcmtPopUp,fX264optSubmeLabel,fX264optSubmePopUp,
+		fX264optTrellisLabel,fX264optTrellisPopUp};
 
     for( unsigned i = 0;
          i < sizeof( controls ) / sizeof( NSControl * ); i++ )
@@ -1316,17 +1319,20 @@ return registrationDictionary;
 {
     int format = [fDstFormatPopUp indexOfSelectedItem];
     int codecs = [fDstCodecsPopUp indexOfSelectedItem];
-	[fDisplayX264Options setEnabled: NO];
-	[fDisplayX264OptionsLabel setEnabled: NO];
-    /* Update the encoder popup fDisplayX264OptionsLabel*/
+	[fX264optView setHidden: YES];
+	[fX264optViewTitleLabel setStringValue: @"Only Used With The x264 (H.264) Codec"];
+	
+
+    /* Update the encoder popup*/
     if( ( FormatSettings[format][codecs] & HB_VCODEC_X264 ) )
     {
         /* MPEG-4 -> H.264 */
         [fVidEncoderPopUp removeAllItems];
 		[fVidEncoderPopUp addItemWithTitle: @"x264 (h.264 Main)"];
 		[fVidEncoderPopUp addItemWithTitle: @"x264 (h.264 iPod)"];
-        [fDisplayX264Options setEnabled: YES];
-        [fDisplayX264OptionsLabel setEnabled: YES];
+        [fX264optView setHidden: NO];
+		[fX264optViewTitleLabel setStringValue: @"x264 Advanced Options"];
+		
     }
     else if( ( FormatSettings[format][codecs] & HB_VCODEC_FFMPEG ) )
     {
@@ -1335,7 +1341,7 @@ return registrationDictionary;
         [fVidEncoderPopUp addItemWithTitle: @"FFmpeg"];
         [fVidEncoderPopUp addItemWithTitle: @"XviD"];
         [fVidEncoderPopUp selectItemAtIndex: 0];
-		
+				
     }
 
     if( FormatSettings[format][codecs] & HB_ACODEC_AC3 )
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index c154bbb60..18a98773e 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -136,12 +136,20 @@
                 fVidTargetSizeField = NSTextField; 
                 fVidTwoPassCheck = NSButton; 
                 fWindow = NSWindow; 
+                fX264optBframesLabel = NSTextField; 
                 fX264optBframesPopUp = NSPopUpButton; 
+                fX264optNfpskipLabel = NSTextField; 
                 fX264optNfpskipPopUp = NSPopUpButton; 
+                fX264optNodctdcmtLabel = NSTextField; 
                 fX264optNodctdcmtPopUp = NSPopUpButton; 
+                fX264optRefLabel = NSTextField; 
                 fX264optRefPopUp = NSPopUpButton; 
+                fX264optSubmeLabel = NSTextField; 
                 fX264optSubmePopUp = NSPopUpButton; 
+                fX264optTrellisLabel = NSTextField; 
                 fX264optTrellisPopUp = NSPopUpButton; 
+                fX264optView = NSView; 
+                fX264optViewTitleLabel = NSTextField; 
                 tableView = NSTableView; 
             }; 
             SUPERCLASS = NSObject; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index a14de9d9c..16c7cb417 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -19,8 +19,8 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>1867</integer>
 		<integer>21</integer>
+		<integer>1867</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8P2137</string>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index c8883f681..bc32495df 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib