MacGui: Move x264 advanced options code to a new class (HBAdvancedController) and add a new nib to simplify future gui changes

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

6 files changed, 154 insertions, 51 deletions

diff --git a/macosx/English.lproj/AdvancedView.nib/classes.nib b/macosx/English.lproj/AdvancedView.nib/classes.nib
new file mode 100644
index 000000000..9ced59c01
--- /dev/null
+++ b/macosx/English.lproj/AdvancedView.nib/classes.nib
@@ -0,0 +1,61 @@
+{
+    IBClasses = (
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {
+            ACTIONS = {
+                X264AdvancedOptionsChanged = id; 
+                X264AdvancedOptionsSet = id; 
+                X264AdvancedOptionsSetCurrentSettings = id; 
+                X264AdvancedOptionsStandardizeOptString = id; 
+            }; 
+            CLASS = HBAdvancedController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                fDisplayX264Options = NSTextField; 
+                fDisplayX264OptionsLabel = NSTextField; 
+                fEmptyView = NSView; 
+                fX264opt8x8dctLabel = NSTextField; 
+                fX264opt8x8dctSwitch = NSButton; 
+                fX264optAlphaDeblockPopUp = NSPopUpButton; 
+                fX264optAnalyseLabel = NSTextField; 
+                fX264optAnalysePopUp = NSPopUpButton; 
+                fX264optBPyramidLabel = NSTextField; 
+                fX264optBPyramidSwitch = NSButton; 
+                fX264optBRDOLabel = NSTextField; 
+                fX264optBRDOSwitch = NSButton; 
+                fX264optBetaDeblockPopUp = NSPopUpButton; 
+                fX264optBframesLabel = NSTextField; 
+                fX264optBframesPopUp = NSPopUpButton; 
+                fX264optBiMELabel = NSTextField; 
+                fX264optBiMESwitch = NSButton; 
+                fX264optCabacLabel = NSTextField; 
+                fX264optCabacSwitch = NSButton; 
+                fX264optDeblockLabel = NSTextField; 
+                fX264optDirectPredLabel = NSTextField; 
+                fX264optDirectPredPopUp = NSPopUpButton; 
+                fX264optMERangeLabel = NSTextField; 
+                fX264optMERangePopUp = NSPopUpButton; 
+                fX264optMixedRefsLabel = NSTextField; 
+                fX264optMixedRefsSwitch = NSButton; 
+                fX264optMotionEstLabel = NSTextField; 
+                fX264optMotionEstPopUp = NSPopUpButton; 
+                fX264optNfpskipLabel = NSTextField; 
+                fX264optNfpskipSwitch = NSButton; 
+                fX264optNodctdcmtLabel = NSTextField; 
+                fX264optNodctdcmtSwitch = NSButton; 
+                fX264optRefLabel = NSTextField; 
+                fX264optRefPopUp = NSPopUpButton; 
+                fX264optSubmeLabel = NSTextField; 
+                fX264optSubmePopUp = NSPopUpButton; 
+                fX264optTrellisLabel = NSTextField; 
+                fX264optTrellisPopUp = NSPopUpButton; 
+                fX264optView = NSView; 
+                fX264optViewTitleLabel = NSTextField; 
+                fX264optWeightBLabel = NSTextField; 
+                fX264optWeightBSwitch = NSButton; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file
diff --git a/macosx/English.lproj/AdvancedView.nib/info.nib b/macosx/English.lproj/AdvancedView.nib/info.nib
new file mode 100644
index 000000000..c21a0c3e6
--- /dev/null
+++ b/macosx/English.lproj/AdvancedView.nib/info.nib
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>216 196 356 240 0 0 1440 878 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>254</key>
+		<string>465 444 550 282 0 0 1440 878 </string>
+		<key>5</key>
+		<string>289 494 550 282 0 0 1440 878 </string>
+	</dict>
+	<key>IBFramework Version</key>
+	<string>446.1</string>
+	<key>IBLockedObjects</key>
+	<array>
+		<integer>5</integer>
+		<integer>254</integer>
+	</array>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>5</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>8R2218</string>
+</dict>
+</plist>
diff --git a/macosx/English.lproj/AdvancedView.nib/keyedobjects.nib b/macosx/English.lproj/AdvancedView.nib/keyedobjects.nib
new file mode 100644
index 000000000..5fb13e9ae
--- /dev/null
+++ b/macosx/English.lproj/AdvancedView.nib/keyedobjects.nib
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index c813db235..40dbb00e4 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -2,13 +2,63 @@
     IBClasses = (
         {
             ACTIONS = {
-                Cancel = id; 
-                Pause = id; 
-                Rip = id; 
                 X264AdvancedOptionsChanged = id; 
                 X264AdvancedOptionsSet = id; 
                 X264AdvancedOptionsSetCurrentSettings = id; 
                 X264AdvancedOptionsStandardizeOptString = id; 
+            }; 
+            CLASS = HBAdvancedController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                fDisplayX264Options = NSTextField; 
+                fDisplayX264OptionsLabel = NSTextField; 
+                fX264opt8x8dctLabel = NSTextField; 
+                fX264opt8x8dctSwitch = NSButton; 
+                fX264optAlphaDeblockPopUp = NSPopUpButton; 
+                fX264optAnalyseLabel = NSTextField; 
+                fX264optAnalysePopUp = NSPopUpButton; 
+                fX264optBPyramidLabel = NSTextField; 
+                fX264optBPyramidSwitch = NSButton; 
+                fX264optBRDOLabel = NSTextField; 
+                fX264optBRDOSwitch = NSButton; 
+                fX264optBetaDeblockPopUp = NSPopUpButton; 
+                fX264optBframesLabel = NSTextField; 
+                fX264optBframesPopUp = NSPopUpButton; 
+                fX264optBiMELabel = NSTextField; 
+                fX264optBiMESwitch = NSButton; 
+                fX264optCabacLabel = NSTextField; 
+                fX264optCabacSwitch = NSButton; 
+                fX264optDeblockLabel = NSTextField; 
+                fX264optDirectPredLabel = NSTextField; 
+                fX264optDirectPredPopUp = NSPopUpButton; 
+                fX264optMERangeLabel = NSTextField; 
+                fX264optMERangePopUp = NSPopUpButton; 
+                fX264optMixedRefsLabel = NSTextField; 
+                fX264optMixedRefsSwitch = NSButton; 
+                fX264optMotionEstLabel = NSTextField; 
+                fX264optMotionEstPopUp = NSPopUpButton; 
+                fX264optNfpskipLabel = NSTextField; 
+                fX264optNfpskipSwitch = NSButton; 
+                fX264optNodctdcmtLabel = NSTextField; 
+                fX264optNodctdcmtSwitch = NSButton; 
+                fX264optRefLabel = NSTextField; 
+                fX264optRefPopUp = NSPopUpButton; 
+                fX264optSubmeLabel = NSTextField; 
+                fX264optSubmePopUp = NSPopUpButton; 
+                fX264optTrellisLabel = NSTextField; 
+                fX264optTrellisPopUp = NSPopUpButton; 
+                fX264optView = NSView; 
+                fX264optViewTitleLabel = NSTextField; 
+                fX264optWeightBLabel = NSTextField; 
+                fX264optWeightBSwitch = NSButton; 
+            }; 
+            SUPERCLASS = NSView; 
+        }, 
+        {
+            ACTIONS = {
+                Cancel = id; 
+                Pause = id; 
+                Rip = id; 
                 addAllAudioTracksToPopUp = id; 
                 addFactoryPresets = id; 
                 addToQueue = id; 
@@ -16,6 +66,7 @@
                 audioTrackMixdownChanged = id; 
                 audioTrackPopUpChanged = id; 
                 browseFile = id; 
+                browseSources = id; 
                 calculateBitrate = id; 
                 calculatePictureSizing = id; 
                 chapterPopUpChanged = id; 
@@ -26,6 +77,7 @@
                 deletePreset = id; 
                 encoderPopUpChanged = id; 
                 formatPopUpChanged = id; 
+                getDefaultPresets = id; 
                 insertPreset = id; 
                 openForums = id; 
                 openHomepage = id; 
@@ -55,6 +107,7 @@
             LANGUAGE = ObjC; 
             OUTLETS = {
                 fAddPresetPanel = NSPanel; 
+                fAdvancedView = NSBox; 
                 fAudBitrateField = NSTextField; 
                 fAudBitratePopUp = NSPopUpButton; 
                 fAudLang1Field = NSTextField; 
@@ -69,8 +122,6 @@
                 fAudTrack2MixPopUp = NSPopUpButton; 
                 fChapterTable = NSTableView; 
                 fCreateChapterMarkers = NSButton; 
-                fDisplayX264Options = NSTextField; 
-                fDisplayX264OptionsLabel = NSTextField; 
                 fDstBrowseButton = NSButton; 
                 fDstCodecsField = NSTextField; 
                 fDstCodecsPopUp = NSPopUpButton; 
@@ -133,15 +184,11 @@
                 fPresetsDelete = NSButton; 
                 fQueueStatus = NSTextField; 
                 fRipIndicator = NSProgressIndicator; 
-                fScanController = ScanController; 
                 fScanIndicator = NSProgressIndicator; 
-                fScanPanel = NSPanel; 
-                fScanStatus = NSTextField; 
                 fSrcChapterEndPopUp = NSPopUpButton; 
                 fSrcChapterField = NSTextField; 
                 fSrcChapterStartPopUp = NSPopUpButton; 
                 fSrcChapterToField = NSTextField; 
-                fSrcDVD1Field = NSTextField; 
                 fSrcDVD2Field = NSTextField; 
                 fSrcDuration1Field = NSTextField; 
                 fSrcDuration2Field = NSTextField; 
@@ -167,45 +214,6 @@
                 fVidTurboPassCheck = NSButton; 
                 fVidTwoPassCheck = NSButton; 
                 fWindow = NSWindow; 
-                fX264opt8x8dctLabel = NSTextField; 
-                fX264opt8x8dctSwitch = NSButton; 
-                fX264optAlphaDeblockPopUp = NSPopUpButton; 
-                fX264optAnalyseLabel = NSTextField; 
-                fX264optAnalysePopUp = NSPopUpButton; 
-                fX264optBPyramidLabel = NSTextField; 
-                fX264optBPyramidSwitch = NSButton; 
-                fX264optBRDOLabel = NSTextField; 
-                fX264optBRDOSwitch = NSButton; 
-                fX264optBetaDeblockPopUp = NSPopUpButton; 
-                fX264optBframesLabel = NSTextField; 
-                fX264optBframesPopUp = NSPopUpButton; 
-                fX264optBiMELabel = NSTextField; 
-                fX264optBiMESwitch = NSButton; 
-                fX264optCabacLabel = NSTextField; 
-                fX264optCabacSwitch = NSButton; 
-                fX264optDeblockLabel = NSTextField; 
-                fX264optDirectPredLabel = NSTextField; 
-                fX264optDirectPredPopUp = NSPopUpButton; 
-                fX264optMERangeLabel = NSTextField; 
-                fX264optMERangePopUp = NSPopUpButton; 
-                fX264optMixedRefsLabel = NSTextField; 
-                fX264optMixedRefsSwitch = NSButton; 
-                fX264optMotionEstLabel = NSTextField; 
-                fX264optMotionEstPopUp = NSPopUpButton; 
-                fX264optNfpskipLabel = NSTextField; 
-                fX264optNfpskipSwitch = NSButton; 
-                fX264optNodctdcmtLabel = NSTextField; 
-                fX264optNodctdcmtSwitch = NSButton; 
-                fX264optRefLabel = NSTextField; 
-                fX264optRefPopUp = NSPopUpButton; 
-                fX264optSubmeLabel = NSTextField; 
-                fX264optSubmePopUp = NSPopUpButton; 
-                fX264optTrellisLabel = NSTextField; 
-                fX264optTrellisPopUp = NSPopUpButton; 
-                fX264optView = NSView; 
-                fX264optViewTitleLabel = NSTextField; 
-                fX264optWeightBLabel = NSTextField; 
-                fX264optWeightBSwitch = NSButton; 
                 tableView = NSTableView; 
             }; 
             SUPERCLASS = NSObject; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index d9eb9f92d..532b25d26 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -3,15 +3,15 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>5 70 451 803 0 0 1440 878 </string>
+	<string>144 230 417 350 0 0 1440 878 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1843</key>
-		<string>540 238 200 530 0 0 1280 778 </string>
+		<string>720 93 200 530 0 0 1440 878 </string>
 		<key>2436</key>
 		<string>307 361 192 68 0 0 1440 878 </string>
 		<key>29</key>
-		<string>772 342 368 44 0 0 1680 1028 </string>
+		<string>790 391 368 44 0 0 1440 878 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
@@ -25,6 +25,12 @@
 	</array>
 	<key>IBOldestOS</key>
 	<integer>4</integer>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>365</integer>
+		<integer>29</integer>
+		<integer>21</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>8R2218</string>
 	<key>IBUserGuides</key>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index acacaf066..5389ac3de 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib