MacGui: Clean up a few things w/x264optstring prefs and presets

- Change abr of AppleTV built in preset to 2500 kbps
- Note: as usual, after updating your copy, use "Update Built-In Presets" in the presets menu for changes to take effect.
- Fix so that closing picture window does not reset the preset chosen display to "Custom"
- Add a user preference to show or hide the chosen x264 option strings in the main gui window. Defaults to off.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@525 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 6205a2dcc..f10ce5e60 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -195,7 +195,8 @@
             CLASS = PrefsController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                fDefAdvancedx264FlagsView = NSButton; 
+                fDefAdvancedx264FlagsShow = NSButton; 
+                fDefAdvancedx264FlagsView = NSTextField; 
                 fDefAutoNaming = NSButton; 
                 fDefChapterMarkers = NSButton; 
                 fDefCrf = NSButton; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 5ec8a74df..6c0f51e56 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>1843</key>
 		<string>610 276 220 592 0 0 1440 878 </string>
 		<key>29</key>
-		<string>16 1134 365 44 0 0 1920 1178 </string>
+		<string>11 834 365 44 0 0 1440 878 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
@@ -19,9 +19,11 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>1438</integer>
-		<integer>1867</integer>
 		<integer>29</integer>
+		<integer>1867</integer>
+		<integer>1438</integer>
+		<integer>365</integer>
+		<integer>21</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 be60a3839..3a3dd72ce 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib