MacGui: Show x264 options string right under the "Encoder" drop down in main window if x264 is selected and any advanced x264 options strings are going to be used. This fields reads any in presets and if a preset isnt selected, looks to see if any will be used from the preferences NSTextView.

- Temporary location most likely for debugging
- May move to another location
- May add a preference to toggle this info field on or off ?

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

3 files changed, 9 insertions, 2 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 4225d3672..87e81bfc3 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1679,6 +1679,13 @@ the user is using "Custom" settings by determining the sender*/
 		/* Empty the field to display custom x264 preset options*/
 		[fDisplayX264Options setStringValue: @""];
 		curUserPresetChosenNum = nil;
+		/* If we have MP4, AVC H.264 and x264 Main then we look to see
+		if there are any x264 options from the preferences to use */
+		if ([fDstFormatPopUp indexOfSelectedItem] == 0 && [fDstCodecsPopUp indexOfSelectedItem] == 1)
+		{
+		//[fDisplayX264Options setStringValue: [NSString stringWithFormat:[chosenPreset valueForKey:@"x264Option"]]];
+			[fDisplayX264Options setStringValue: [NSString stringWithFormat:[[NSUserDefaults standardUserDefaults] stringForKey:@"DefAdvancedx264Flags"]]];
+		}
 		
 	}
 }
@@ -1688,7 +1695,7 @@ the user is using "Custom" settings by determining the sender*/
 {
     /* Deselect the currently selected Preset if there is one*/
 		[tableView deselectRow:[tableView selectedRow]];
-    /* If we have MP4, AVC H.264 and x264 Main then we enable the x264 Options field for the
+    /* If we have MP4, AVC H.264 and Main then we enable the x264 Options field for the
 	 Add Preset window we are about to open. We do this before we actually open the panel,
 	 as doing it after causes it to stick from the last selection for some reason. */
 	if ([fDstFormatPopUp indexOfSelectedItem] == 0 && [fDstCodecsPopUp indexOfSelectedItem] == 1)
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 69337d2a3..0ec631a81 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>29</integer>
 		<integer>21</integer>
+		<integer>29</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 da48dff94..14cc389e0 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib