MacGui: removed an unnecessary NSBox in the Advanced tab.

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

3 files changed, 11 insertions, 20 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index d4036e81d..a180c798d 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -36,6 +36,8 @@ extern NSString *keyTitleTag;
 {
     IBOutlet NSWindow            * fWindow;
 
+    IBOutlet NSTabView *fMainTabView;
+
     /* Video view controller */
     HBVideoController       * fVideoController;
     IBOutlet NSTabViewItem  * fVideoTab;
@@ -52,6 +54,10 @@ extern NSString *keyTitleTag;
 	HBChapterTitlesController    * fChapterTitlesController;
     IBOutlet NSTabViewItem       * fChaptersTitlesTab;
 
+    /* Advanced options tab */
+    HBAdvancedController         * fAdvancedOptions;
+	IBOutlet NSTabViewItem       * fAdvancedTab;
+
     /* Main Menu Outlets */
     NSMenuItem                   * fOpenSourceTitleMMenu;
     
@@ -68,11 +74,7 @@ extern NSString *keyTitleTag;
     
     /* Picture Preview */
     HBPreviewController            * fPreviewController;
-    
-    /* Advanced options tab */
-    HBAdvancedController         * fAdvancedOptions;
-	IBOutlet NSBox               * fAdvancedView;
-    
+
     HBPreferencesController      * fPreferencesController;
     
     /* Queue panel */
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 6a719859c..afd2e2b34 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -663,7 +663,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
 
     // setup the advanced view controller
     fAdvancedOptions = [[HBAdvancedController alloc] init];
-	[fAdvancedView addSubview: [fAdvancedOptions view]];
+	[fAdvancedTab setView:[fAdvancedOptions view]];
 
     // setup the video view controller
     fVideoController = [[HBVideoController alloc] init];
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index ba0e2b91c..9341a8cdd 100644
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="14A329r" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" defaultVersion="1060" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
@@ -64,18 +64,6 @@
                                 <view key="view" id="2016">
                                     <rect key="frame" x="10" y="25" width="900" height="319"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    <subviews>
-                                        <box title="Box" boxType="oldStyle" borderType="none" titlePosition="noTitle" id="2513">
-                                            <rect key="frame" x="-3" y="17" width="906" height="295"/>
-                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                            <view key="contentView">
-                                                <rect key="frame" x="0.0" y="0.0" width="906" height="295"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                            </view>
-                                            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                                            <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                        </box>
-                                    </subviews>
                                 </view>
                             </tabViewItem>
                             <tabViewItem label="Chapters" identifier="4" id="1989">
@@ -1088,7 +1076,7 @@ DQ
         <customObject id="240" userLabel="HBController" customClass="HBController">
             <connections>
                 <outlet property="fAddPresetPanel" destination="1867" id="1869"/>
-                <outlet property="fAdvancedView" destination="2513" id="2516"/>
+                <outlet property="fAdvancedTab" destination="2015" id="4eO-Lg-7cH"/>
                 <outlet property="fAudioTab" destination="1475" id="AuZ-Uf-bla"/>
                 <outlet property="fChaptersTitlesTab" destination="1989" id="oUt-8L-Ag2"/>
                 <outlet property="fDstBrowseButton" destination="1562" id="1578"/>
@@ -1100,6 +1088,7 @@ DQ
                 <outlet property="fDstMp4LargeFileCheck" destination="2364" id="4578"/>
                 <outlet property="fDstMp4iPodFileCheck" destination="4967" id="4969"/>
                 <outlet property="fEncodeStartStopPopUp" destination="5513" id="5527"/>
+                <outlet property="fMainTabView" destination="1474" id="XMU-Vi-8QM"/>
                 <outlet property="fOpenSourceTitleMMenu" destination="2698" id="2700"/>
                 <outlet property="fPresetDrawer" destination="1841" id="1889"/>
                 <outlet property="fPresetNewDesc" destination="2673" id="2674"/>