MacGUI: refactor PictureController. kill a bit of dead code (~500 lines), switch some ivars to properties, hide the private methods and rework the deinterlace logic. Plus UI alignment.

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

1 files changed, 420 insertions, 699 deletions

diff --git a/macosx/PictureController.m b/macosx/PictureController.m
index f74eb3112..e5b30844a 100644
--- a/macosx/PictureController.m
+++ b/macosx/PictureController.m
@@ -1,18 +1,113 @@
 /* $Id: PictureController.mm,v 1.11 2005/08/01 15:10:44 titer Exp $
 
-   This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
 
-#import "PictureController.h"
 #import "Controller.h"
+#import "PictureController.h"
 #import "HBPreviewController.h"
 
+@interface HBPictureController ()
+{
+    hb_title_t               * fTitle;
+
+    PreviewController        * fPreviewController;
+
+    /* Picture Sizing */
+    IBOutlet NSTabView       * fSizeFilterView;
+    IBOutlet NSBox           * fPictureSizeBox;
+    IBOutlet NSBox           * fPictureCropBox;
+
+    IBOutlet NSTextField     * fWidthField;
+    IBOutlet NSStepper       * fWidthStepper;
+    IBOutlet NSTextField     * fHeightField;
+    IBOutlet NSStepper       * fHeightStepper;
+    IBOutlet NSTextField     * fRatioLabel;
+    IBOutlet NSButton        * fRatioCheck;
+    IBOutlet NSMatrix        * fCropMatrix;
+    IBOutlet NSTextField     * fCropTopField;
+    IBOutlet NSStepper       * fCropTopStepper;
+    IBOutlet NSTextField     * fCropBottomField;
+    IBOutlet NSStepper       * fCropBottomStepper;
+    IBOutlet NSTextField     * fCropLeftField;
+    IBOutlet NSStepper       * fCropLeftStepper;
+    IBOutlet NSTextField     * fCropRightField;
+    IBOutlet NSStepper       * fCropRightStepper;
+
+    IBOutlet NSTextField     * fModulusLabel;
+    IBOutlet NSPopUpButton   * fModulusPopUp;
+
+    IBOutlet NSTextField     * fDisplayWidthField;
+    IBOutlet NSTextField     * fDisplayWidthLabel;
+
+    IBOutlet NSTextField     * fParWidthField;
+    IBOutlet NSTextField     * fParHeightField;
+    IBOutlet NSTextField     * fParWidthLabel;
+    IBOutlet NSTextField     * fParHeightLabel;
+
+    /* for now we setup some values to remember our pars and dars
+     * from scan
+     */
+    int titleParWidth;
+    int titleParHeight;
+    float dar;
+
+	IBOutlet NSPopUpButton   * fAnamorphicPopUp;
+    IBOutlet NSTextField     * fSizeInfoField;
+
+    int output_width, output_height, output_par_width, output_par_height;
+    int display_width;
+
+    /* used to track the previous state of the keep aspect
+     ratio checkbox when turning anamorphic on, so it can be
+     returned to the previous state when anamorphic is turned
+     off */
+    BOOL    keepAspectRatioPreviousState;
+
+    /* Video Filters */
+    IBOutlet NSBox           * fDetelecineBox;
+    IBOutlet NSPopUpButton   * fDetelecinePopUp;
+
+    IBOutlet NSBox           * fDecombDeinterlaceBox;
+    IBOutlet NSSlider        * fDecombDeinterlaceSlider;
+
+    IBOutlet NSBox           * fDecombBox;
+    IBOutlet NSPopUpButton   * fDecombPopUp;
+
+    IBOutlet NSBox           * fDeinterlaceBox;
+    IBOutlet NSPopUpButton   * fDeinterlacePopUp;
+
+    IBOutlet NSBox           * fDenoiseBox;
+    IBOutlet NSPopUpButton   * fDenoisePopUp;
+
+    IBOutlet NSBox           * fDeblockBox; // also holds the grayscale box
+    IBOutlet NSTextField     * fDeblockField;
+    IBOutlet NSSlider        * fDeblockSlider;
+
+    IBOutlet NSButton        * fGrayscaleCheck;
+}
+
+- (void) tabView: (NSTabView *) tabView didSelectTabViewItem: (NSTabViewItem *) tabViewItem;
+
+- (void) resizeInspectorForTab: (id) sender;
 
+- (void) adjustSizingDisplay:(id) sender;
+- (void) adjustFilterDisplay: (id) sender;
 
-@implementation PictureController
+- (void) reloadStillPreview;
 
-- (id)init
+/* Internal Actions */
+- (IBAction) settingsChanged: (id) sender;
+- (IBAction) FilterSettingsChanged: (id) sender;
+- (IBAction) modeDecombDeinterlaceSliderChanged: (id) sender;
+- (IBAction) deblockSliderChanged: (id) sender;
+
+@end
+
+@implementation HBPictureController
+
+- (id) init
 {
 	if (self = [super initWithWindowNibName:@"PictureSettings"])
 	{
@@ -25,56 +120,162 @@
         // If/when we switch a lot of this stuff to bindings, this can probably
         // go away.
         [self window];
-        
-	fPreviewController = [[PreviewController alloc] init];
+
+        _detelecineCustomString = @"";
+        _deinterlaceCustomString = @"";
+        _decombCustomString = @"";
+        _denoiseCustomString = @"";
+
+        fPreviewController = [[PreviewController alloc] init];
     }
+
 	return self;
 }
 
-//------------------------------------------------------------------------------------
-// Displays and brings the picture window to the front
-//------------------------------------------------------------------------------------
-- (IBAction) showPictureWindow: (id)sender
+- (void) awakeFromNib
 {
+    [[self window] setDelegate:self];
 
+    if( ![[self window] setFrameUsingName:@"PictureSizing"] )
+        [[self window] center];
 
-        if ([[self window] isVisible])
-        {
-            [[self window] close];
-        }
-        else
-        {
-            [self showWindow:sender];
-            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
-            [self setToWindowedMode];
-        }
+    [self setWindowFrameAutosaveName:@"PictureSizing"];
+    [[self window] setExcludedFromWindowsMenu:YES];
 
-    [self adjustFilterDisplay:nil];
-    [self adjustSizingDisplay:nil];
-}
+    /* Populate the user interface */
+    [fWidthStepper  setValueWraps: NO];
+    [fWidthStepper  setIncrement: 16];
+    [fWidthStepper  setMinValue: 64];
+    [fHeightStepper setValueWraps: NO];
+    [fHeightStepper setIncrement: 16];
+    [fHeightStepper setMinValue: 64];
 
+    [fCropTopStepper    setIncrement: 2];
+    [fCropTopStepper    setMinValue:  0];
+    [fCropBottomStepper setIncrement: 2];
+    [fCropBottomStepper setMinValue:  0];
+    [fCropLeftStepper   setIncrement: 2];
+    [fCropLeftStepper   setMinValue:  0];
+    [fCropRightStepper  setIncrement: 2];
+    [fCropRightStepper  setMinValue:  0];
 
+    /* Populate the Anamorphic NSPopUp button here */
+    [fAnamorphicPopUp removeAllItems];
+    [fAnamorphicPopUp addItemsWithTitles:@[@"None", @"Strict", @"Loose", @"Custom"]];
 
-/* this method is used to detect clicking on a tab in fSizeFilterView */
-- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
+    /* populate the modulus popup here */
+    [fModulusPopUp removeAllItems];
+    [fModulusPopUp addItemsWithTitles:@[@"16", @"8", @"4", @"2"]];
+
+    /* we use a popup to show the detelecine settings */
+    [fDetelecinePopUp removeAllItems];
+    [fDetelecinePopUp addItemsWithTitles:@[@"Off", @"Custom", @"Default"]];
+    [fDetelecinePopUp selectItemAtIndex: self.detelecine];
+
+    /* we use a popup to show the decomb settings */
+	[fDecombPopUp removeAllItems];
+    [fDecombPopUp addItemsWithTitles:@[@"Off", @"Custom", @"Default", @"Fast", @"Bob"]];
+    [self modeDecombDeinterlaceSliderChanged:nil];
+    [fDecombPopUp selectItemAtIndex: self.decomb];
+
+    /* we use a popup to show the deinterlace settings */
+	[fDeinterlacePopUp removeAllItems];
+    [fDeinterlacePopUp addItemsWithTitles:@[@"Off", @"Custom", @"Fast", @"Slow", @"Slower", @"Bob"]];
+    [fDeinterlacePopUp selectItemAtIndex: self.deinterlace];
+
+    /* we use a popup to show the denoise settings */
+	[fDenoisePopUp removeAllItems];
+    [fDenoisePopUp addItemsWithTitles:@[@"Off", @"Custom", @"Weak", @"Medium", @"Strong"]];
+    [fDenoisePopUp selectItemAtIndex: self.denoise];
+}
+
+- (void) setHandle: (hb_handle_t *) handle
 {
+    [fPreviewController SetHandle: handle];
+    [fPreviewController setHBController:(HBController *)self.delegate];
+}
+
+- (void) setTitle: (hb_title_t *) title
+{
+    hb_job_t * job = title->job;
+
+    fTitle = title;
+
+    [fWidthStepper      setMaxValue: title->width];
+    [fWidthStepper      setIntValue: job->width];
+    [fWidthField        setIntValue: job->width];
+    [fHeightStepper     setMaxValue: title->height];
+    [fHeightStepper     setIntValue: job->height];
+    [fHeightField       setIntValue: job->height];
+    [fRatioCheck        setState:    job->keep_ratio ? NSOnState : NSOffState];
+    [fCropTopStepper    setMaxValue: title->height/2-2];
+    [fCropBottomStepper setMaxValue: title->height/2-2];
+    [fCropLeftStepper   setMaxValue: title->width/2-2];
+    [fCropRightStepper  setMaxValue: title->width/2-2];
 
-[self resizeInspectorForTab:nil];
+    [fAnamorphicPopUp selectItemAtIndex: job->anamorphic.mode];
 
+    if (job->modulus)
+    {
+        [fModulusPopUp selectItemWithTitle: [NSString stringWithFormat:@"%d",job->modulus]];
+    }
+    else
+    {
+        [fModulusPopUp selectItemAtIndex: 0];
+    }
+
+    /* We initially set the previous state of keep ar to on */
+    keepAspectRatioPreviousState = 1;
+	if (!self.autoCrop)
+	{
+        [fCropMatrix  selectCellAtRow: 1 column:0];
+        /* If auto, lets set the crop steppers according to current job->crop values */
+        [fCropTopStepper    setIntValue: job->crop[0]];
+        [fCropTopField      setIntValue: job->crop[0]];
+        [fCropBottomStepper setIntValue: job->crop[1]];
+        [fCropBottomField   setIntValue: job->crop[1]];
+        [fCropLeftStepper   setIntValue: job->crop[2]];
+        [fCropLeftField     setIntValue: job->crop[2]];
+        [fCropRightStepper  setIntValue: job->crop[3]];
+        [fCropRightField    setIntValue: job->crop[3]];
+	}
+	else
+	{
+        [fCropMatrix  selectCellAtRow: 0 column:0];
+	}
+
+    /* Set filters widgets according to the filters struct */
+    [fDetelecinePopUp selectItemAtIndex:self.detelecine];
+    [fDecombPopUp selectItemAtIndex:self.decomb];
+    [fDeinterlacePopUp selectItemAtIndex: self.deinterlace];
+    [fDenoisePopUp selectItemAtIndex: self.denoise];
+    [fDeblockSlider setFloatValue:self.deblock];
+    [fGrayscaleCheck setState:self.grayscale];
+
+    [self deblockSliderChanged: nil];
+
+    titleParWidth = job->anamorphic.par_width;
+    titleParHeight = job->anamorphic.par_height;
+
+    [fPreviewController SetTitle:title];
+
+    [self settingsChanged:nil];
 }
 
 #pragma mark -
+#pragma mark Interface Resize
 
-/* resizeInspectorForTab is called at launch, and each time either the 
+/**
+ * resizeInspectorForTab is called at launch, and each time either the
  * Size or Filters tab is clicked. Size gives a horizontally oriented
  * inspector and Filters is a vertically aligned inspector.
  */
-- (IBAction) resizeInspectorForTab: (id)sender
+- (void) resizeInspectorForTab: (id) sender
 {
     NSRect frame = [[self window] frame];
     NSSize screenSize = [[[self window] screen] frame].size;
     NSPoint screenOrigin = [[[self window] screen] frame].origin;
-    
+
     /* We base our inspector size/layout on which tab is active for fSizeFilterView */
     /* we are 1 which is Filters*/
     if ([fSizeFilterView indexOfTabViewItem: [fSizeFilterView selectedTabViewItem]] == 1)
@@ -89,50 +290,46 @@
     }
     else // we are Tab index 0 which is size
     {
-        frame.size.width = 50.0 + [fPictureSizeBox frame].size.width + [fPictureCropBox frame].size.width;
-        frame.size.height = [fPictureSizeBox frame].size.height + 85;
+        frame.size.width = 30.0 + [fPictureSizeBox frame].size.width + [fPictureCropBox frame].size.width;
+        frame.size.height = [fPictureSizeBox frame].size.height + 90;
         /* hide the size summary field at the bottom */
-        [fSizeInfoField setHidden:NO];      
+        [fSizeInfoField setHidden:NO];
     }
     /* get delta's for the change in window size */
     CGFloat deltaX = frame.size.width - [[self window] frame].size.width;
     CGFloat deltaY = frame.size.height - [[self window] frame].size.height;
-    
-    /* Check to see if we have changed the height from current */
-    //if (frame.size.height != [[self window] frame].size.height)
-    //{
-        /* change the inspector origin via the deltaY */
-        frame.origin.y -= deltaY;
-        /* keep the inspector centered so the tabs stay in place */
-        frame.origin.x -= deltaX / 2.0;
-    //}
-    
-     /* we make sure we are not horizontally off of our screen.
+
+    /* change the inspector origin via the deltaY */
+    frame.origin.y -= deltaY;
+    /* keep the inspector centered so the tabs stay in place */
+    frame.origin.x -= deltaX / 2.0;
+
+    /* we make sure we are not horizontally off of our screen.
      * this would be the case if we are on the vertical filter tab
      * and we hit the size tab and the inspector grows horizontally
      * off the screen to the right
-    */
+     */
     if ((frame.origin.x + frame.size.width) > (screenOrigin.x + screenSize.width))
     {
         /* the right side of the preview is off the screen, so shift to the left */
         frame.origin.x = (screenOrigin.x + screenSize.width) - frame.size.width;
     }
-    
+
     [[self window] setFrame:frame display:YES animate:YES];
 }
 
-- (IBAction) adjustSizingDisplay: (id) sender
+- (void) adjustSizingDisplay: (id) sender
 {
     NSSize pictureSizingBoxSize = [fPictureSizeBox frame].size;
-    
+
     NSPoint fPictureSizeBoxOrigin = [fPictureSizeBox frame].origin;
     NSSize pictureCropBoxSize = [fPictureCropBox frame].size;
     NSPoint fPictureCropBoxOrigin = [fPictureCropBox frame].origin;
-    
+
     if ([fAnamorphicPopUp indexOfSelectedItem] == 3) // custom / power user jamboree
     {
-        pictureSizingBoxSize.width = 530;
-        
+        pictureSizingBoxSize.width = 350;
+
         /* Set visibility of capuj widgets */
         [fParWidthField setHidden: NO];
         [fParHeightField setHidden: NO];
@@ -140,39 +337,11 @@
         [fParHeightLabel setHidden: NO];
         [fDisplayWidthField setHidden: NO];
         [fDisplayWidthLabel setHidden: NO];
-        /* adjust/move keep ar checkbox */
-        [fRatioLabel setHidden: YES];
-        [fRatioLabel2 setHidden: NO];
-        
-        /* Optionally swith the Storage and Display width positions*/
-         /*
-         NSPoint fWidthLabelOrigin = [fWidthLabel frame].origin;
-         NSPoint fWidthFieldOrigin = [fWidthField frame].origin;
-         NSPoint fWidthStepperOrigin = [fWidthStepper frame].origin;
-         fWidthFieldOrigin.x = [fRatioLabel2 frame].origin.x + [fRatioLabel2 frame].size.width + 4;
-         [fWidthField setFrameOrigin:fWidthFieldOrigin];
-
-         fWidthStepperOrigin.x = [fWidthField frame].origin.x + [fWidthField frame].size.width + 4;
-         [fWidthStepper setFrameOrigin:fWidthStepperOrigin];
-         
-         fWidthLabelOrigin.x = [fWidthField frame].origin.x - [fWidthLabel frame].size.width - 4;
-         [fWidthLabel setFrameOrigin:fWidthLabelOrigin];
-         [fWidthLabel setStringValue:@"Storage Width:"];
-         */
-        
-        /* set the origin for fRatioCheck so origin.y == fRatioLabel2
-         * and origin.x == fDisplayWidthField
-         */
-         NSPoint fRatioCheckOrigin = [fRatioCheck frame].origin;
-         fRatioCheckOrigin.y = [fRatioLabel2 frame].origin.y - 2;
-         fRatioCheckOrigin.x = [fRatioLabel2 frame].origin.x + [fRatioLabel2 frame].size.width + 4;
-         [fRatioCheck setFrameOrigin:fRatioCheckOrigin];
-         
     }
     else
     {
         pictureSizingBoxSize.width = 200;
-        
+
         /* Set visibility of capuj widgets */
         [fParWidthField setHidden: YES];
         [fParHeightField setHidden: YES];
@@ -180,39 +349,8 @@
         [fParHeightLabel setHidden: YES];
         [fDisplayWidthField setHidden: YES];
         [fDisplayWidthLabel setHidden: YES];
-        /* adjust/move keep ar checkbox */
-        [fRatioLabel setHidden: NO];
-        [fRatioLabel2 setHidden: YES];
-        
-         /* Optionally swith the Storage and Display width positions*/
-         
-         /*
-         NSPoint fWidthLabelOrigin = [fWidthLabel frame].origin;
-         NSPoint fWidthFieldOrigin = [fWidthField frame].origin;
-         NSPoint fWidthStepperOrigin = [fWidthStepper frame].origin;
-         
-         fWidthFieldOrigin.x = [fHeightField frame].origin.x;
-         [fWidthField setFrameOrigin:fWidthFieldOrigin];
-         
-         fWidthStepperOrigin.x = [fHeightStepper frame].origin.x;
-         [fWidthStepper setFrameOrigin:fWidthStepperOrigin];
-         
-         fWidthLabelOrigin.x = [fWidthField frame].origin.x - [fWidthLabel frame].size.width -4;
-         [fWidthLabel setFrameOrigin:fWidthLabelOrigin];
-         [fWidthLabel setStringValue:@"Width:"];
-         */
-        
-        
-        /* set the origin for fRatioCheck so origin.y == fRatioLabel
-         * and origin.x == fWidthStepper
-         */
-         NSPoint fRatioCheckOrigin = [fRatioCheck frame].origin;
-         fRatioCheckOrigin.y = [fRatioLabel frame].origin.y - 2;
-         fRatioCheckOrigin.x = [fWidthStepper frame].origin.x - 2;
-         [fRatioCheck setFrameOrigin:fRatioCheckOrigin];
-        
     }
-    
+
     /* Check to see if we have changed the size from current */
     if (pictureSizingBoxSize.height != [fPictureSizeBox frame].size.height || pictureSizingBoxSize.width != [fPictureSizeBox frame].size.width)
     {
@@ -225,29 +363,27 @@
         /* set our new Picture size box size */
         [fPictureSizeBox setFrameSize:pictureSizingBoxSize];
         [fPictureSizeBox setFrameOrigin:fPictureSizeBoxOrigin];
-        
+
         pictureCropBoxSize.height += deltaYSizeBoxShift;
         fPictureCropBoxOrigin.y -= deltaYSizeBoxShift;
         fPictureCropBoxOrigin.x += deltaXSizeBoxShift;
-        
+
         [fPictureCropBox setFrameSize:pictureCropBoxSize];
         [[fPictureCropBox animator] setFrameOrigin:fPictureCropBoxOrigin];
     }
 
-    
     /* now we call to resize the entire inspector window */
-   [self resizeInspectorForTab:nil];
+    [self resizeInspectorForTab:nil];
 }
 
-- (IBAction) adjustFilterDisplay: (id) sender
+- (void) adjustFilterDisplay: (id) sender
 {
-    
-    NSBox * filterBox = nil;
+    NSBox *filterBox = nil;
     if (sender == fDetelecinePopUp)
     {
         filterBox = fDetelecineBox;
     }
-    
+
     if (sender == fDecombDeinterlaceSlider)
     {
         if ([fDecombDeinterlaceSlider floatValue] == 0.0)
@@ -259,35 +395,34 @@
             filterBox = fDeinterlaceBox;
         }
     }
-    
+
     if (sender == fDecombPopUp)
     {
         filterBox = fDecombBox;
     }
+
     if (sender == fDeinterlacePopUp)
     {
         filterBox = fDeinterlaceBox;
     }
-    
+
     if (sender == fDenoisePopUp)
     {
         filterBox = fDenoiseBox;
     }
-    
+
     NSSize currentSize = [filterBox frame].size;
     NSRect boxFrame = [filterBox frame];
-    
+
     if ([[sender titleOfSelectedItem]  isEqualToString: @"Custom"])
     {
-        
         currentSize.height = 60;
-        
     }
     else
     {
-        currentSize.height = 30;
-        
+        currentSize.height = 36;
     }
+
     /* Check to see if we have changed the size from current */
     if (currentSize.height != [filterBox frame].size.height)
     {
@@ -296,46 +431,33 @@
         /* We get the deltaY here for how much we are expanding/contracting the box vertically */
         CGFloat deltaYBoxShift = currentSize.height - [filterBox frame].size.height;
         boxOrigin.y -= deltaYBoxShift;
-        
+
         boxFrame.size.height = currentSize.height;
         boxFrame.origin.y = boxOrigin.y;
         [filterBox setFrame:boxFrame];
-        
-        /* go ahead and resize the box */
-        //[[filterBox animator] setFrameSize:currentSize];
-        //[[filterBox animator] setFrameOrigin:origin];
- 
-    
+
         if (filterBox == fDecombBox || filterBox == fDeinterlaceBox)
         {
             /* fDecombDeinterlaceBox*/
             NSSize decombDeinterlaceBoxSize = [fDecombDeinterlaceBox frame].size;
             NSPoint decombDeinterlaceBoxOrigin = [fDecombDeinterlaceBox frame].origin;
-            
-            //decombDeinterlaceBoxSize.height = [filterBox frame].size.height + 50;
-            if (sender == fDecombDeinterlaceSlider)
-            {
-                [fHBController writeToActivityLog: "Sender is deinterlace decomb slider"];
-            }
-            
+
             if ([fDeinterlaceBox isHidden] == YES)
             {
                 decombDeinterlaceBoxSize.height = [fDecombBox frame].size.height + 50;
-                [fHBController writeToActivityLog: "Resize by Decomb box"];
             }
             else
             {
                 decombDeinterlaceBoxSize.height = [fDeinterlaceBox frame].size.height + 50;
-                [fHBController writeToActivityLog: "Resize by Deinterlace box"];
             }
             /* get delta's for the change in window size */
-            
+
             CGFloat deltaYdecombDeinterlace = decombDeinterlaceBoxSize.height - [fDecombDeinterlaceBox frame].size.height;
-            
+
             deltaYBoxShift = deltaYdecombDeinterlace;
-            
+
             decombDeinterlaceBoxOrigin.y -= deltaYdecombDeinterlace;
-            
+
             [fDecombDeinterlaceBox setFrameSize:decombDeinterlaceBoxSize];
             [fDecombDeinterlaceBox setFrameOrigin:decombDeinterlaceBoxOrigin];
         }
@@ -348,10 +470,10 @@
         {
             decombDeintOrigin.y -= deltaYBoxShift;
             [fDecombDeinterlaceBox setFrameOrigin:decombDeintOrigin];
-            
+
             denoiseOrigin.y -= deltaYBoxShift;
             [fDenoiseBox setFrameOrigin:denoiseOrigin];
-            
+
             deblockOrigin.y -= deltaYBoxShift;
             [fDeblockBox setFrameOrigin:deblockOrigin];
         }
@@ -359,88 +481,82 @@
         {
             denoiseOrigin.y -= deltaYBoxShift;
             [fDenoiseBox setFrameOrigin:denoiseOrigin];
-            
+
             deblockOrigin.y -= deltaYBoxShift;
             [fDeblockBox setFrameOrigin:deblockOrigin];
         }
-        
+
         if (sender == fDenoisePopUp)
         {
             deblockOrigin.y -= deltaYBoxShift;
             [fDeblockBox setFrameOrigin:deblockOrigin];
         }
-        
+
         /* now we call to resize the entire inspector window */
         [self resizeInspectorForTab:nil];
     }
-    
 }
 
-
-#pragma mark -
-
-
-
-- (IBAction) showPreviewWindow: (id)sender
+- (NSString *) pictureSizeInfoString
 {
-    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PreviewWindowIsOpen"];
-    [fPreviewController showWindow:sender];
+    return [fSizeInfoField stringValue];
 }
 
-- (void) enablePreviewHudControls
+- (void) reloadStillPreview
 {
-    [fPreviewController enableHudControls];
+    [fPreviewController SetTitle:fTitle];
 }
 
-- (void) disablePreviewHudControls
-{
-    [fPreviewController disableHudControls];
-}
+#pragma mark -
 
-- (void) setToWindowedMode
+/**
+ * Displays and brings the picture window to the front
+ */
+- (IBAction) showPictureWindow: (id) sender
 {
-    /* Set the window back to Floating Window mode 
-     * This will put the window always on top, but
-     * since we have Hide on Deactivate set in our
-     * xib, if other apps are put in focus we will
-     * hide properly to stay out of the way
-     */
-    [[self window] setLevel:NSFloatingWindowLevel];
+    if ([[self window] isVisible])
+    {
+        [[self window] close];
+    }
+    else
+    {
+        [self showWindow:sender];
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
+        /* Set the window back to Floating Window mode
+         * This will put the window always on top, but
+         * since we have Hide on Deactivate set in our
+         * xib, if other apps are put in focus we will
+         * hide properly to stay out of the way
+         */
+        [[self window] setLevel:NSFloatingWindowLevel];
+    }
+
+    [self adjustFilterDisplay:nil];
+    [self adjustSizingDisplay:nil];
 }
 
-- (void)setHBController: (HBController *)controller
+- (IBAction) showPreviewWindow: (id) sender
 {
-    fHBController = controller;
-    [fPreviewController   setHBController: controller];
-    
+    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PreviewWindowIsOpen"];
+    [fPreviewController showWindow:sender];
 }
 
-- (void)awakeFromNib
+- (void) windowWillClose: (NSNotification *)aNotification
 {
-    [fPictureWindow setDelegate:self];
-    if( ![[self window] setFrameUsingName:@"PictureSizing"] )
-        [[self window] center];
-    [self setWindowFrameAutosaveName:@"PictureSizing"];
-    [[self window] setExcludedFromWindowsMenu:YES];
-    
-    [self setInitialPictureFilters];
-    
-    /* Setup our layers for core animation */
-    [fSizeFilterView setWantsLayer:YES];
-    [fPictureSizeBox setWantsLayer:YES];
-    [fPictureCropBox setWantsLayer:YES];
-    
+    [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"PictureSizeWindowIsOpen"];
 }
 
-
-- (void)windowWillClose:(NSNotification *)aNotification
+- (BOOL) windowShouldClose: (id) sender
 {
-[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"PictureSizeWindowIsOpen"];
+    return YES;
 }
 
-- (BOOL)windowShouldClose:(id)fPictureWindow
+/**
+ * This method is used to detect clicking on a tab in fSizeFilterView
+ */
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
 {
-    return YES;
+    [self resizeInspectorForTab:nil];
 }
 
 - (void) dealloc
@@ -449,178 +565,10 @@
     [super dealloc];
 }
 
-- (void) SetHandle: (hb_handle_t *) handle
-{
-    fHandle = handle;
-    
-    [fPreviewController SetHandle: fHandle];
-}
-
-- (void) SetTitle: (hb_title_t *) title
-{
-    hb_job_t * job = title->job;
-
-    fTitle = title;
-
-    [fWidthStepper  setValueWraps: NO];
-    [fWidthStepper  setIncrement: 16];
-    [fWidthStepper  setMinValue: 64];
-    [fHeightStepper setValueWraps: NO];
-    [fHeightStepper setIncrement: 16];
-    [fHeightStepper setMinValue: 64];
-    
-    [fCropTopStepper    setIncrement: 2];
-    [fCropTopStepper    setMinValue:  0];
-    [fCropBottomStepper setIncrement: 2];
-    [fCropBottomStepper setMinValue:  0];
-    [fCropLeftStepper   setIncrement: 2];
-    [fCropLeftStepper   setMinValue:  0];
-    [fCropRightStepper  setIncrement: 2];
-    [fCropRightStepper  setMinValue:  0];
-    
-    [fWidthStepper      setMaxValue: title->width];
-    [fWidthStepper      setIntValue: job->width];
-    [fWidthField        setIntValue: job->width];
-    [fHeightStepper     setMaxValue: title->height];
-    [fHeightStepper     setIntValue: job->height];
-    [fHeightField       setIntValue: job->height];
-    [fRatioCheck        setState:    job->keep_ratio ? NSOnState : NSOffState];
-    [fCropTopStepper    setMaxValue: title->height/2-2];
-    [fCropBottomStepper setMaxValue: title->height/2-2];
-    [fCropLeftStepper   setMaxValue: title->width/2-2];
-    [fCropRightStepper  setMaxValue: title->width/2-2];
-
-    /* Populate the Anamorphic NSPopUp button here */
-    [fAnamorphicPopUp removeAllItems];
-    [fAnamorphicPopUp addItemWithTitle: @"None"];
-    [fAnamorphicPopUp addItemWithTitle: @"Strict"];
-    [fAnamorphicPopUp addItemWithTitle: @"Loose"];
-    [fAnamorphicPopUp addItemWithTitle: @"Custom"];
-    [fAnamorphicPopUp selectItemAtIndex: job->anamorphic.mode];
-    
-    //[self adjustSizingDisplay:nil];
-    
-    /* populate the modulus popup here */
-    [fModulusPopUp removeAllItems];
-    [fModulusPopUp addItemWithTitle: @"16"];
-    [fModulusPopUp addItemWithTitle: @"8"];
-    [fModulusPopUp addItemWithTitle: @"4"];
-    [fModulusPopUp addItemWithTitle: @"2"];
-    if (job->modulus)
-    {
-        [fModulusPopUp selectItemWithTitle: [NSString stringWithFormat:@"%d",job->modulus]];
-    }
-    else
-    {
-        [fModulusPopUp selectItemAtIndex: 0];
-    }
-    
-    
-    /* We initially set the previous state of keep ar to on */
-    keepAspectRatioPreviousState = 1;
-	if (!autoCrop)
-	{
-        [fCropMatrix  selectCellAtRow: 1 column:0];
-        /* If auto, lets set the crop steppers according to current job->crop values */
-        [fCropTopStepper    setIntValue: job->crop[0]];
-        [fCropTopField      setIntValue: job->crop[0]];
-        [fCropBottomStepper setIntValue: job->crop[1]];
-        [fCropBottomField   setIntValue: job->crop[1]];
-        [fCropLeftStepper   setIntValue: job->crop[2]];
-        [fCropLeftField     setIntValue: job->crop[2]];
-        [fCropRightStepper  setIntValue: job->crop[3]];
-        [fCropRightField    setIntValue: job->crop[3]];
-	}
-	else
-	{
-        [fCropMatrix  selectCellAtRow: 0 column:0];
-	}
-	
-    /* Set filters widgets according to the filters struct */
-    [fDetelecinePopUp selectItemAtIndex:fPictureFilterSettings.detelecine];
-    [fDecombPopUp selectItemAtIndex:fPictureFilterSettings.decomb];
-    [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
-    [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
-    [fDeblockSlider setFloatValue:fPictureFilterSettings.deblock];
-    [fGrayscaleCheck setState:fPictureFilterSettings.grayscale];
-    
-    [self deblockSliderChanged: nil];
-    
-    fPicture = 0;
-    MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
-    MaxOutputHeight = title->height - job->crop[0] - job->crop[1];
-    
-    titleDarWidth = job->anamorphic.dar_width;
-    titleDarHeight = job->anamorphic.dar_height;
-    
-    titleParWidth = job->anamorphic.par_width;
-    titleParHeight = job->anamorphic.par_height;
-    
-    [self SettingsChanged:nil];
-}
-
-- (IBAction) storageLinkChanged: (id) sender
-{
-    /* since we have a tickless slider, make sure we are at 0.0 or 1.0 */
-    if ([fStorageLinkSlider floatValue] < 0.50)
-    {
-        [fStorageLinkSlider setFloatValue:0.0];
-        /* set slider labels to reflect choice */
-        [fStorageLinkParLabel setEnabled:YES];
-        [fStorageLinkDisplayLabel setEnabled:NO];
-
-    }
-    else
-    {
-        [fStorageLinkSlider setFloatValue:1.0];
-        /* set slider labels to reflect choice */
-        [fStorageLinkParLabel setEnabled:NO];
-        [fStorageLinkDisplayLabel setEnabled:YES];
-    }
-    
-}
-
-- (IBAction) parLinkChanged: (id) sender
-{
-    /* since we have a tickless slider, make sure we are at 0.0 or 1.0 */
-    if ([fParLinkSlider floatValue] < 0.50)
-    {
-        [fParLinkSlider setFloatValue:0.0];
-        /* set slider labels to reflect choice */
-        [fParLinkStorageLabel setEnabled:YES];
-        [fParLinkDisplayLabel setEnabled:NO];
-    }
-    else
-    {
-        [fParLinkSlider setFloatValue:1.0];
-        /* set slider labels to reflect choice */
-        [fParLinkStorageLabel setEnabled:NO];
-        [fParLinkDisplayLabel setEnabled:YES];
-    }
-    
-}
-
-- (IBAction) displayLinkChanged: (id) sender
-{
-    /* since we have a tickless slider, make sure we are at 0.0 or 1.0 */
-    if ([fDisplayLinkSlider floatValue] < 0.50)
-    {
-        [fDisplayLinkSlider setFloatValue:0.0];
-        /* set slider labels to reflect choice */
-        [fDisplayLinkStorageLabel setEnabled:YES];
-        [fDisplayLinkParLabel setEnabled:NO];
-    }
-    else
-    {
-        [fDisplayLinkSlider setFloatValue:1.0];
-        /* set slider labels to reflect choice */
-        [fDisplayLinkStorageLabel setEnabled:NO];
-        [fDisplayLinkParLabel setEnabled:YES];
-    }
-    
-}    
+#pragma mark -
+#pragma mark Interface Update Logic
 
-- (IBAction) SettingsChanged: (id) sender
+- (IBAction) settingsChanged: (id) sender
 {
     hb_job_t * job = fTitle->job;
 
@@ -646,7 +594,7 @@
             {
                 [fHeightStepper     setIntValue: job->height];
                 [fHeightField       setIntValue: job->height];
-            }    
+            }
         }
     }
     else
@@ -657,22 +605,22 @@
     }
 
     job->modulus = [[fModulusPopUp titleOfSelectedItem] intValue];
-    
+
     [fWidthStepper  setIncrement: job->modulus];
     [fHeightStepper setIncrement: job->modulus];
 
     /* Since custom anamorphic allows for a height setting > fTitle->height
      * check to make sure it is returned to fTitle->height for all other modes
      */
-     [fHeightStepper setMaxValue: fTitle->height];
-    
-    autoCrop = ( [fCropMatrix selectedRow] == 0 );
-    [fCropTopStepper    setEnabled: !autoCrop];
-    [fCropBottomStepper setEnabled: !autoCrop];
-    [fCropLeftStepper   setEnabled: !autoCrop];
-    [fCropRightStepper  setEnabled: !autoCrop];
-    
-    if( autoCrop )
+    [fHeightStepper setMaxValue: fTitle->height];
+
+    self.autoCrop = ( [fCropMatrix selectedRow] == 0 );
+    [fCropTopStepper    setEnabled: !self.autoCrop];
+    [fCropBottomStepper setEnabled: !self.autoCrop];
+    [fCropLeftStepper   setEnabled: !self.autoCrop];
+    [fCropRightStepper  setEnabled: !self.autoCrop];
+
+    if( self.autoCrop )
     {
         memcpy( job->crop, fTitle->crop, 4 * sizeof( int ) );
     }
@@ -683,14 +631,13 @@
         job->crop[2] = [fCropLeftStepper   intValue];
         job->crop[3] = [fCropRightStepper  intValue];
     }
-    
+
     [fRatioCheck setEnabled: YES];
 
-    
     [fParWidthField setEnabled: NO];
     [fParHeightField setEnabled: NO];
     [fDisplayWidthField setEnabled: NO];
-    
+
     /* If we are not custom anamorphic, make sure we retain the orginal par */
     if( [fAnamorphicPopUp indexOfSelectedItem] != 3 )
     {
@@ -698,21 +645,21 @@
         job->anamorphic.par_height = titleParHeight;
         [fRatioLabel setHidden: NO];
     }
-    
+
 	if( [fAnamorphicPopUp indexOfSelectedItem] > 0 )
 	{
         if ([fAnamorphicPopUp indexOfSelectedItem] == 1) // strict
         {
             [fWidthStepper      setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
             [fWidthField        setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
-            
+
             /* This will show correct anamorphic height values, but
              show distorted preview picture ratio */
             [fHeightStepper      setIntValue: fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1]];
             [fHeightField        setIntValue: fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1]];
             job->width       = [fWidthStepper  intValue];
             job->height      = [fHeightStepper intValue];
-            
+
             job->anamorphic.mode = 1;
             [fWidthStepper setEnabled: NO];
             [fWidthField setEnabled: NO];
@@ -744,32 +691,29 @@
             [fHeightStepper      setIntValue: output_height];
             [fHeightField        setIntValue: output_height];
             job->height      = [fHeightStepper intValue];
-            
+
         }
         else if ([fAnamorphicPopUp indexOfSelectedItem] == 3) // custom / power user jamboree
         {
-
-#pragma mark - STARTCapuj
-
             job->anamorphic.mode = 3;
-            
+
             /* Set the status of our custom ana only widgets accordingly */
             [fModulusPopUp setEnabled:YES];
-            
+
             [fWidthStepper setEnabled: YES];
             [fWidthField setEnabled: YES];
-            
+
             [fHeightStepper setEnabled: YES];
             /* for capuj the storage field is immaterial */
             [fHeightField setEnabled: YES];
-            
+
             [fRatioCheck setEnabled: YES];
             if (sender == fRatioCheck)
             {
                 if ([fRatioCheck  state] == NSOnState)
                 {
                     [fParWidthField setEnabled: NO];
-                    [fParHeightField setEnabled: NO];   
+                    [fParHeightField setEnabled: NO];
                 }
                 else
                 {
@@ -777,17 +721,17 @@
                     [fParHeightField setEnabled: YES];
                 }
             }
-            
+
             [fParWidthField setEnabled: YES];
             [fParHeightField setEnabled: YES];
-            
+
             [fDisplayWidthField setEnabled: YES];
-            
-            
+
+
             /* If we are coming into custom anamorphic we reset the par to original
              * which gives us a way back if things get hosed up.
              */
-             
+
             if (sender == fAnamorphicPopUp)
             {
                 /* When entering custom anamorphic, we start with keep ar on */
@@ -798,30 +742,30 @@
                  */
                 [fParWidthField setEnabled: NO];
                 [fParHeightField setEnabled: NO];
-                
+
                 job->width = [fWidthStepper intValue];
                 job->height = [fHeightStepper intValue];
 
                 /* make sure our par is set back to original */
                 job->anamorphic.par_width = titleParWidth;
                 job->anamorphic.par_height = titleParHeight;
-                
+
                 [fParWidthField   setIntValue: titleParWidth];
                 [fParHeightField   setIntValue: titleParHeight];
-                
+
                 /* modify our par dims from our storage dims */
                 hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
                 float par_display_width = (float)output_width * (float)output_par_width / (float)output_par_height;
-                
+
                 /* go ahead and mod the display dims */
                 [fDisplayWidthField   setStringValue: [NSString stringWithFormat:@"%.2f", par_display_width]];
-                
+
                 job->anamorphic.dar_width = [fDisplayWidthField floatValue];
                 job->anamorphic.dar_height = (float)[fHeightStepper intValue];
-                
+
                 /* Set our dar here assuming we are just coming into capuj mode */
                 dar = [fDisplayWidthField floatValue] / (float)[fHeightField intValue];
-                
+
             }
 
             /* For capuj we disable these fields if we are keeping the dispay aspect */
@@ -830,17 +774,17 @@
                 /*
                  KEEPING ASPECT RATIO
                  DAR = DISPLAY WIDTH / DISPLAY HEIGHT (cache after every modification) */
-                 /*Disable editing: PIXEL WIDTH, PIXEL HEIGHT */
-                
+                /*Disable editing: PIXEL WIDTH, PIXEL HEIGHT */
+
                 [fParWidthField setEnabled: NO];
                 [fParHeightField setEnabled: NO];
-                
+
                 /* Changing DISPLAY WIDTH: */
                 if (sender == fDisplayWidthField)
                 {
                     job->anamorphic.dar_width = [fDisplayWidthField floatValue];
                     /* Changes HEIGHT to keep DAR */
-                     /* calculate the height to retain the dar  */
+                    /* calculate the height to retain the dar  */
                     int raw_calulated_height = (int)((int)[fDisplayWidthField floatValue] / dar);
                     /*  now use the modulus to go lower if there is a remainder  */
                     /* Note to me, raw_calulated_height % [[fModulusPopUp titleOfSelectedItem] intValue]
@@ -856,21 +800,21 @@
                     [fHeightStepper setIntValue: modulus_height];
                     job->anamorphic.dar_height = (float)[fHeightStepper intValue];
                     job->height = [fHeightStepper intValue];
-                    
+
                     /* Changes PIXEL WIDTH to new DISPLAY WIDTH */
                     [fParWidthField setIntValue: [fDisplayWidthField intValue]];
                     job->anamorphic.par_width = [fParWidthField intValue];
                     /* Changes PIXEL HEIGHT to STORAGE WIDTH */
                     [fParHeightField  setIntValue: [fWidthField intValue]];
                     job->anamorphic.par_height = [fParHeightField intValue];
-                    
+
                 }
                 /* Changing HEIGHT: */
                 if (sender == fHeightStepper)
                 {
-                   job->anamorphic.dar_height = (float)[fHeightStepper intValue];
-                   job->height = [fHeightStepper intValue];
-                   
+                    job->anamorphic.dar_height = (float)[fHeightStepper intValue];
+                    job->height = [fHeightStepper intValue];
+
                     /* Changes DISPLAY WIDTH to keep DAR*/
                     [fDisplayWidthField setStringValue: [NSString stringWithFormat: @"%.2f",[fHeightStepper intValue] * dar]];
                     job->anamorphic.dar_width = [fDisplayWidthField floatValue];
@@ -885,10 +829,10 @@
                 if (sender == fWidthStepper)
                 {
                     job->width = [fWidthStepper intValue];
-                    
+
                     job->anamorphic.dar_width = [fDisplayWidthField floatValue];
                     job->anamorphic.dar_height = [fHeightStepper floatValue];
-                     
+
                     /* Changes PIXEL WIDTH to DISPLAY WIDTH */
                     [fParWidthField setIntValue: [fDisplayWidthField intValue]];
                     job->anamorphic.par_width = [fParWidthField intValue];
@@ -924,7 +868,7 @@
                     /* changes PIXEL WIDTH to DISPLAY WIDTH and PIXEL HEIGHT to STORAGE WIDTH */
                     [fParWidthField setIntValue: [fDisplayWidthField intValue]];
                     job->anamorphic.par_width = [fParWidthField intValue];
-                    
+
                     [fParHeightField  setIntValue: [fWidthField intValue]];
                     job->anamorphic.par_height = [fParHeightField intValue];
                     hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
@@ -936,12 +880,10 @@
                     job->anamorphic.dar_height = [fHeightStepper intValue];
                     job->height = [fHeightStepper intValue];
                 }
-                
+
             }
-            
-#pragma mark - END Capuj                       
         }
-        
+
         /* if the sender is the Anamorphic checkbox, record the state
          of KeepAspect Ratio so it can be reset if Anamorphic is unchecked again */
         if (sender == fAnamorphicPopUp)
@@ -952,7 +894,7 @@
         {
             [fRatioCheck setState:NSOffState];
         }
-        
+
     }
     else
 	{
@@ -970,16 +912,15 @@
         {
             [fRatioCheck setState:keepAspectRatioPreviousState];
         }
-        
 	}
-	
+
     if ([fAnamorphicPopUp indexOfSelectedItem] != 3)
     {
         job->keep_ratio  = ( [fRatioCheck state] == NSOnState );
         if( job->keep_ratio )
         {
             if( sender == fWidthStepper || sender == fRatioCheck ||
-               sender == fCropTopStepper || sender == fCropBottomStepper|| 
+               sender == fCropTopStepper || sender == fCropBottomStepper||
                sender == fCropMatrix || sender == nil  )
             {
                 hb_fix_aspect( job, HB_KEEP_WIDTH );
@@ -998,10 +939,10 @@
                     hb_fix_aspect( job, HB_KEEP_WIDTH );
                 }
             }
-            
+
         }
     }
-    
+
     // hb_get_preview can't handle sizes that are larger than the original title
     if ([fAnamorphicPopUp indexOfSelectedItem] != 3)
     {
@@ -1010,13 +951,13 @@
         {
             job->width = fTitle->width;
         }
-        
+
         if( job->height > fTitle->height )
         {
             job->height = fTitle->height;
         }
     }
-    
+
     [fWidthStepper      setIntValue: job->width];
     [fWidthField        setIntValue: job->width];
     if( [fAnamorphicPopUp indexOfSelectedItem] != 2) // if we are not loose or custom
@@ -1024,7 +965,7 @@
         [fHeightStepper     setIntValue: job->height];
         [fHeightField       setIntValue: job->height];
     }
-    
+
     [fCropTopStepper    setIntValue: job->crop[0]];
     [fCropTopField      setIntValue: job->crop[0]];
     [fCropBottomStepper setIntValue: job->crop[1]];
@@ -1033,7 +974,7 @@
     [fCropLeftField     setIntValue: job->crop[2]];
     [fCropRightStepper  setIntValue: job->crop[3]];
     [fCropRightField    setIntValue: job->crop[3]];
-    
+
     /*
      * Sanity-check here for previews < 16 pixels to avoid crashing
      * hb_get_preview(). In fact, let's get previews at least 64 pixels in both
@@ -1043,108 +984,23 @@
     {
         [self reloadStillPreview];
     }
-    
+
     /* we get the sizing info to display from fPreviewController */
     [fSizeInfoField setStringValue: [fPreviewController pictureSizeInfoString]];
-    
+
     if (sender != nil)
     {
-        [fHBController pictureSettingsDidChange];
-    }   
-    
+        [self.delegate pictureSettingsDidChange];
+    }
+
     if ([[self window] isVisible])
-    { 
+    {
         [self adjustSizingDisplay:nil];
     }
-    
-}
-
-- (NSString*) getPictureSizeInfoString
-{
-    return [fSizeInfoField stringValue];
-}
-
-- (void)reloadStillPreview
-{
-    [fPreviewController SetTitle:fTitle];
-}
-
-
-#pragma mark -
-
-- (BOOL) autoCrop
-{
-    return autoCrop;
-}
-- (void) setAutoCrop: (BOOL) setting
-{
-    autoCrop = setting;
-}
-
-- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
-{
-    //[self SetTitle:title];
-    [self showWindow:sender];
-    //[self adjustSizingDisplay:nil];
-    //[self adjustFilterDisplay:nil];
-
-}
-
-
-#pragma mark -
-/* we use this to setup the initial picture filters upon first launch, after that their states
-are maintained across different sources */
-- (void) setInitialPictureFilters
-{
-	/* we use a popup to show the detelecine settings */
-	[fDetelecinePopUp removeAllItems];
-    [fDetelecinePopUp addItemWithTitle: @"Off"];
-    [fDetelecinePopUp addItemWithTitle: @"Custom"];
-    [fDetelecinePopUp addItemWithTitle: @"Default"];
-    [fDetelecinePopUp selectItemAtIndex: fPictureFilterSettings.detelecine];
-    
-    [self modeDecombDeinterlaceSliderChanged:nil];
-    /* we use a popup to show the decomb settings */
-	[fDecombPopUp removeAllItems];
-    [fDecombPopUp addItemWithTitle: @"Off"];
-    [fDecombPopUp addItemWithTitle: @"Custom"];
-    [fDecombPopUp addItemWithTitle: @"Default"];
-    [fDecombPopUp addItemWithTitle: @"Fast"];
-    [fDecombPopUp addItemWithTitle: @"Bob"];
-    
-    [fDecombPopUp selectItemAtIndex: fPictureFilterSettings.decomb];
-    
-    /* we use a popup to show the deinterlace settings */
-	[fDeinterlacePopUp removeAllItems];
-    [fDeinterlacePopUp addItemWithTitle: @"Off"];
-    [fDeinterlacePopUp addItemWithTitle: @"Custom"];
-    [fDeinterlacePopUp addItemWithTitle: @"Fast"];
-    [fDeinterlacePopUp addItemWithTitle: @"Slow"];
-    [fDeinterlacePopUp addItemWithTitle: @"Slower"];
-    [fDeinterlacePopUp addItemWithTitle: @"Bob"];
-    
-	/* Set deinterlaces level according to the integer in the main window */
-	[fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
-
-	/* we use a popup to show the denoise settings */
-	[fDenoisePopUp removeAllItems];
-    [fDenoisePopUp addItemWithTitle: @"Off"];
-    [fDenoisePopUp addItemWithTitle: @"Custom"];
-    [fDenoisePopUp addItemWithTitle: @"Weak"];
-	[fDenoisePopUp addItemWithTitle: @"Medium"];
-    [fDenoisePopUp addItemWithTitle: @"Strong"];
-	/* Set denoises level according to the integer in the main window */
-	[fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
-    
-
 }
 
-
-
-
 - (IBAction) modeDecombDeinterlaceSliderChanged: (id) sender
 {
-    
     /* since its a tickless slider, we have to  make sure we are on or off */
     if ([fDecombDeinterlaceSlider floatValue] < 0.50)
     {
@@ -1154,180 +1010,96 @@ are maintained across different sources */
     {
         [fDecombDeinterlaceSlider setFloatValue:1.0];
     }
-    
-    
+
     /* Decomb selected*/
     if ([fDecombDeinterlaceSlider floatValue] == 0.0)
     {
         [fDecombBox setHidden:NO];
         [fDeinterlaceBox setHidden:YES];
-        fPictureFilterSettings.decomb = [fDecombPopUp indexOfSelectedItem];
-        fPictureFilterSettings.usedecomb = 1;
-        fPictureFilterSettings.deinterlace = 0;
-        [fDecombPopUp selectItemAtIndex:fPictureFilterSettings.decomb];
+        self.decomb = [fDecombPopUp indexOfSelectedItem];
+        _useDecomb = 1;
+        self.deinterlace = 0;
+        [fDecombPopUp selectItemAtIndex:self.decomb];
         [self adjustFilterDisplay:fDecombPopUp];
     }
     else
     {
         [fDecombBox setHidden:YES];
         [fDeinterlaceBox setHidden:NO];
-        fPictureFilterSettings.usedecomb = 0;
-        fPictureFilterSettings.decomb = 0;
-        [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
+        _useDecomb = 0;
+        self.decomb = 0;
+        [fDeinterlacePopUp selectItemAtIndex: self.deinterlace];
         [self adjustFilterDisplay:fDeinterlacePopUp];
     }
+
     [self FilterSettingsChanged: fDecombDeinterlaceSlider];
 }
 
 
 - (IBAction) FilterSettingsChanged: (id) sender
 {
-    
-    fPictureFilterSettings.detelecine  = [fDetelecinePopUp indexOfSelectedItem];
+    self.detelecine  = [fDetelecinePopUp indexOfSelectedItem];
     [self adjustFilterDisplay:fDetelecinePopUp];
-    
-    fPictureFilterSettings.decomb = [fDecombPopUp indexOfSelectedItem];
+
+    self.decomb = [fDecombPopUp indexOfSelectedItem];
     [self adjustFilterDisplay:fDecombPopUp];
-    
-    fPictureFilterSettings.deinterlace = [fDeinterlacePopUp indexOfSelectedItem];
+
+    self.deinterlace = [fDeinterlacePopUp indexOfSelectedItem];
     [self adjustFilterDisplay:fDeinterlacePopUp];
-    
-    fPictureFilterSettings.denoise = [fDenoisePopUp indexOfSelectedItem];
+
+    self.denoise = [fDenoisePopUp indexOfSelectedItem];
     [self adjustFilterDisplay:fDenoisePopUp];
-    
+
     if ([[fDeblockField stringValue] isEqualToString:@"Off"])
     {
-        fPictureFilterSettings.deblock  = 0;
+        self.deblock  = 0;
     }
     else
     {
-        fPictureFilterSettings.deblock  = [fDeblockField intValue];
+        self.deblock  = [fDeblockField intValue];
     }
-    
-    fPictureFilterSettings.grayscale = [fGrayscaleCheck state];
-    
-    [self decombDeinterlacePreviewImage];
-    
-    if (sender != nil)
-    {
-        [fHBController pictureSettingsDidChange];
-        
-    }   
 
-}
-
-- (void) decombDeinterlacePreviewImage
-{
-    /* XXX: make sure we actually have a title before de-referencing it */
-    if (fTitle == NULL)
+    // Tell PreviewController whether it should deinterlace
+    // the previews or not
+    if ((self.deinterlace && !self.useDecomb) ||
+        (self.decomb && self.useDecomb))
     {
-        return;
+        fPreviewController.deinterlacePreview = YES;
     }
-    
-    if ([fDecombDeinterlaceSlider floatValue] < 0.50)
+    else
     {
-        /* Since Libhb only shows a deinterlaced preview image via deinterlace .. for decomb we
-         do a quick switch to get libhb to show a deinterlaced image if needed even though deinterlace
-         has not been changed by the user. so we temporarily switch deinterace accoring to decomb then
-         call reloadStillPreview quickly and then switch deinterlace back to its proper state.
-         */
-        
-        // decomb is chosen
-        if (fPictureFilterSettings.decomb > 0)
-        {
-            /* Temporarily turn on deinterlacing .... */
-            fTitle->job->deinterlace  = 1;
-            /* Grab a still preview ... */
-            [self reloadStillPreview];
-            /* ... then reset deinterlace back to where specified in the ui */
-            fTitle->job->deinterlace  = (int)[fDeinterlacePopUp indexOfSelectedItem];
-            
-        }
-        else
-        {
-            [self reloadStillPreview];   
-        }
-        
+        fPreviewController.deinterlacePreview = NO;
     }
-    else
+    
+    self.grayscale = [fGrayscaleCheck state];
+    
+    
+    if (sender != nil)
     {
-        fTitle->job->deinterlace  = (int)[fDeinterlacePopUp indexOfSelectedItem];
+        [self.delegate pictureSettingsDidChange];
         [self reloadStillPreview];
     }
 }
-#pragma mark -
 
 - (IBAction) deblockSliderChanged: (id) sender
 {
     if ([fDeblockSlider floatValue] == 4.0)
     {
-    [fDeblockField setStringValue: [NSString stringWithFormat: @"Off"]];
+        [fDeblockField setStringValue: @"Off"];
     }
     else
     {
-    [fDeblockField setStringValue: [NSString stringWithFormat: @"%.0f", [fDeblockSlider floatValue]]];
+        [fDeblockField setStringValue: [NSString stringWithFormat: @"%.0f", [fDeblockSlider floatValue]]];
     }
 	[self FilterSettingsChanged: sender];
 }
 
-
-- (NSInteger)detelecine
-{
-    return fPictureFilterSettings.detelecine;
-}
-
-- (NSString*) detelecineCustomString
-{
-    return [fDetelecineField stringValue];
-}
-
-- (void) setDetelecine: (NSInteger) setting
-{
-    fPictureFilterSettings.detelecine = setting;
-}
-
-- (void) setDetelecineCustomString: (NSString*) string 
-{
-    [fDetelecineField setStringValue:string];
-}
-
-- (NSInteger) deinterlace
-{
-    return fPictureFilterSettings.deinterlace;
-}
-- (NSString*) deinterlaceCustomString
-{
-    return [fDeinterlaceField stringValue];
-}
-
-- (void) setDeinterlaceCustomString: (NSString*) string 
-{
-    [fDeinterlaceField setStringValue:string];
-}
-
-- (void) setDeinterlace: (NSInteger) setting
-{
-    fPictureFilterSettings.deinterlace = setting;
-}
-- (NSInteger) decomb
-{
-    return fPictureFilterSettings.decomb;
-}
-
-- (NSString*) decombCustomString
-{
-    return [fDecombField stringValue];
-}
-
-- (NSInteger) useDecomb
-{
-    return fPictureFilterSettings.usedecomb;
-}
+#pragma mark -
 
 - (void) setUseDecomb: (NSInteger) setting
 {
-    fPictureFilterSettings.usedecomb = setting;
-    if (fPictureFilterSettings.usedecomb == 1)
+    _useDecomb = setting;
+    if (self.useDecomb == 1)
     {
         [fDecombDeinterlaceSlider setFloatValue:0.0];
     }
@@ -1335,59 +1107,8 @@ are maintained across different sources */
     {
         [fDecombDeinterlaceSlider setFloatValue:1.0];
     }
+    
     [self modeDecombDeinterlaceSliderChanged:nil];
 }
 
-- (void) setDecomb: (NSInteger) setting {
-    fPictureFilterSettings.decomb = setting;
-}
-
-- (void) setDecombCustomString: (NSString*) string 
-{
-    [fDecombField setStringValue:string];
-}
-
-- (NSInteger) denoise
-{
-    return fPictureFilterSettings.denoise;
-}
-
-- (NSString*) denoiseCustomString
-{
-    return [fDenoiseField stringValue];
-}
-
-- (void) setDenoiseCustomString: (NSString*) string 
-{
-    [fDenoiseField setStringValue:string];
-}
-
-- (void) setDenoise: (NSInteger) setting
-{
-    fPictureFilterSettings.denoise = setting;
-}
-
-- (NSInteger) deblock
-{
-    return fPictureFilterSettings.deblock;
-}
-
-- (void) setDeblock: (NSInteger) setting
-{
-    fPictureFilterSettings.deblock = setting;
-}
-
-- (NSInteger) grayscale
-{
-    return fPictureFilterSettings.grayscale;
-}
-
-- (void) setGrayscale: (NSInteger) setting
-{
-    fPictureFilterSettings.grayscale = setting;
-}
-
-
-
 @end
-