MacGui: x264 options in presets - initial implementation

- x264 options string can be entered in NSTextview in the create new preset window
NOTE:
- When using x264, the gui first looks for a preset with a x264 option string available and then looks for the string in the preferences if it cant find it in the preset. So, if there is a string available in the preset, it ignores the string (if there is one available) in the prefs.

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

3 files changed, 7 insertions, 4 deletions

diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index 28e806f96..99d4450ad 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -47,6 +47,7 @@
                 fAudRateField = NSTextField; 
                 fAudRatePopUp = NSPopUpButton; 
                 fCreateChapterMarkers = NSButton; 
+                fDisplayX264Options = NSTextField; 
                 fDstBrowseButton = NSButton; 
                 fDstCodecsField = NSTextField; 
                 fDstCodecsPopUp = NSPopUpButton; 
@@ -83,6 +84,8 @@
                 fPresetDrawer = NSDrawer; 
                 fPresetNewName = NSTextField; 
                 fPresetNewPicSettingsApply = NSButton; 
+                fPresetNewX264Opt = NSTextView; 
+                fPresetNewX264OptLabel = NSTextField; 
                 fPresetSaveButton = NSButton; 
                 fPresetSelectedDisplay = NSTextField; 
                 fPresetsAdd = NSButton; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 035e42b5d..67a0fec86 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -3,11 +3,11 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>-2 228 630 601 0 0 1440 878 </string>
+	<string>160 277 630 601 0 0 1440 878 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1843</key>
-		<string>1791 35 220 592 1440 0 1280 1024 </string>
+		<string>610 276 220 592 0 0 1440 878 </string>
 		<key>29</key>
 		<string>102 834 300 44 0 0 1440 878 </string>
 	</dict>
@@ -19,9 +19,9 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
-		<integer>1843</integer>
 		<integer>21</integer>
+		<integer>29</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 f1c390d96..581ea6c23 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib