Merge the 5.1 branch into the trunk.

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

3 files changed, 26 insertions, 5 deletions

diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index ec791480a..2b248aded 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -7,29 +7,38 @@
                 CalculateBitrate = id; 
                 Cancel = id; 
                 ChapterPopUpChanged = id; 
+                CloseAddPresetPanel = id; 
                 CodecsPopUpChanged = id; 
                 EnableQueue = id; 
                 EncoderPopUpChanged = id; 
                 FormatPopUpChanged = id; 
+                InsertPreset = id; 
+                LanguagePopUpChanged = id; 
                 OpenForums = id; 
                 OpenHomepage = id; 
                 Pause = id; 
                 QualitySliderChanged = id; 
                 Rip = id; 
+                ShowAddPresetPanel = id; 
                 ShowPicturePanel = id; 
                 ShowQueuePanel = id; 
                 ShowScanPanel = id; 
                 TitlePopUpChanged = id; 
                 VideoMatrixChanged = id; 
+                addPreset = id; 
+                deletePreset = id; 
+                tableViewSelected = id; 
             }; 
             CLASS = HBController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                fAddToQuButton = NSButton; 
+                fAddPresetPanel = NSPanel; 
+                fAddToQuButton = NSTableView; 
                 fAudBitrateField = NSTextField; 
                 fAudBitratePopUp = NSPopUpButton; 
                 fAudLang1Field = NSTextField; 
                 fAudLang1PopUp = NSPopUpButton; 
+                fAudLang1SurroundCheck = NSButton; 
                 fAudLang2Field = NSTextField; 
                 fAudLang2PopUp = NSPopUpButton; 
                 fAudRateField = NSTextField; 
@@ -67,6 +76,12 @@
                 fPictureButton = NSButton; 
                 fPictureController = PictureController; 
                 fPicturePanel = NSPanel; 
+                fPresetDrawer = NSDrawer; 
+                fPresetNewName = NSTextField; 
+                fPresetNewPicSettingsApply = NSButton; 
+                fPresetSelectedDisplay = NSTextField; 
+                fPresetsAdd = NSButton; 
+                fPresetsDelete = NSButton; 
                 fQueueAddButton = NSButton; 
                 fQueueCheck = NSButton; 
                 fQueueController = QueueController; 
@@ -105,6 +120,7 @@
                 fVidTargetSizeField = NSTextField; 
                 fVidTwoPassCheck = NSButton; 
                 fWindow = NSWindow; 
+                tableView = NSTableView; 
             }; 
             SUPERCLASS = NSObject; 
         }, 
@@ -167,10 +183,13 @@
             CLASS = PrefsController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                fDefAdvancedx264FlagsView = NSButton; 
+                fDefAudioSurround = NSButton; 
                 fDefCrf = NSButton; 
                 fDefDeinterlace = NSButton; 
                 fDefPicSizeAutoSetipod = NSButton; 
                 fDefPixelRatio = NSButton; 
+                fDefPresetDrawerShow = id; 
                 fFileExtItunes = NSButton; 
                 fPanel = NSPanel; 
                 fUpdateCheck = NSButton; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index eae7265dc..64beae6c9 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -3,11 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>74 141 555 411 0 0 1440 878 </string>
+	<string>25 277 630 601 0 0 1440 878 </string>
 	<key>IBEditorPositions</key>
 	<dict>
+		<key>1843</key>
+		<string>610 276 220 592 0 0 1440 878 </string>
 		<key>29</key>
-		<string>69 330 258 44 0 0 1440 878 </string>
+		<string>102 834 300 44 0 0 1440 878 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
@@ -17,8 +19,8 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>1438</integer>
-		<integer>21</integer>
+		<integer>29</integer>
+		<integer>1843</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8L127</string>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 9f9c43bb3..7bfb8416d 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib