MacGui: move the picture and filters settings to the main window.

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

1 files changed, 9 insertions, 16 deletions

diff --git a/macosx/HBController.m b/macosx/HBController.m
index a87e25f7e..5b13267e7 100644
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -13,13 +13,13 @@
 #import "HBPreset.h"
 #import "HBUtilities.h"
 
+#import "HBPictureViewController.h"
 #import "HBVideoController.h"
 #import "HBAudioController.h"
 #import "HBSubtitlesController.h"
 #import "HBAdvancedController.h"
 #import "HBChapterTitlesController.h"
 
-#import "HBPictureController.h"
 #import "HBPreviewController.h"
 #import "HBPreviewGenerator.h"
 
@@ -75,9 +75,6 @@
 
         // Inits the controllers
         fPreviewController = [[HBPreviewController alloc] init];
-        fPictureController = [[HBPictureController alloc] init];
-        fPictureController.previewWindow = fPreviewController;
-        fPreviewController.pictureSettingsWindow = fPictureController;
 
         fQueueController = queueController;
         fQueueController.controller = self;
@@ -169,6 +166,10 @@
     fVideoController = [[HBVideoController alloc] initWithAdvancedController:fAdvancedOptions];
     [fVideoTab setView:[fVideoController view]];
 
+    // setup the picture view controller
+    fPictureViewController = [[HBPictureViewController alloc] init];
+    [fPictureTab setView:[fPictureViewController view]];
+
     [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
                                                               forKeyPath:@"values.HBShowAdvancedTab"
                                                                  options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial
@@ -501,10 +502,9 @@
     _job = job;
 
     // Set the jobs info to the view controllers
-    fPictureController.picture = job.picture;
-    fPictureController.filters = job.filters;
-
-    fVideoController.job = job;
+    fPictureViewController.picture = job.picture;
+    fPictureViewController.filters = job.filters;
+    fVideoController.video = job.video;
     fAudioController.audio = job.audio;
     fSubtitlesViewController.subtitles = job.subtitles;
     fChapterTitlesController.job = job;
@@ -517,6 +517,7 @@
     {
         fPreviewController.generator = nil;
     }
+    fPreviewController.picture = job.picture;
 
     [self enableUI:(job != nil)];
 
@@ -1269,14 +1270,6 @@
     [fPresetDrawer toggle:self];
 }
 
-/**
- * Shows Picture Settings Window.
- */
-- (IBAction)showPicturePanel:(id)sender
-{
-	[fPictureController showWindow:sender];
-}
-
 - (IBAction)showPreviewWindow:(id)sender
 {
 	[fPreviewController showWindow:sender];