MacGui: Video Filter and Picture Settings

- Changed picture settings and video filter display in the main window to three text fields (removed 24 outlets and text fields). Its a hoky layout right now, but I have a feeling the video tab will be changing.
- Show actual cropping values in the main window as well as Auto/Custom
- Show custom filter settings if used.
- Removed redundant anamorphic calculation code. Its now accessed from each controller that needs it from preview controller
- Fixed an issue where decomb from a previous preset would linger in a preset that did not have decomb specified.
- Updated the queue display to show custom filter info if present.

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

1 files changed, 9 insertions, 6 deletions

diff --git a/macosx/HBPreviewController.mm b/macosx/HBPreviewController.mm
index 1b26e6caf..39106c9b9 100644
--- a/macosx/HBPreviewController.mm
+++ b/macosx/HBPreviewController.mm
@@ -219,11 +219,8 @@ return YES;
     [fMovieCreationProgressIndicator setHidden: YES];
     
     [fPictureView setHidden:NO];
-
     [fPictureView setImage: [self imageForPicture: fPicture]];
     
-    	
-	
     NSSize displaySize = NSMakeSize( ( CGFloat )fTitle->width, ( CGFloat )fTitle->height );
     /* Set the picture size display fields below the Preview Picture*/
     if( fTitle->job->anamorphic.mode == 1 ) // Original PAR Implementation
@@ -232,7 +229,7 @@ return YES;
         output_height = fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1];
         display_width = output_width * fTitle->job->anamorphic.par_width / fTitle->job->anamorphic.par_height;
         [fInfoField setStringValue:[NSString stringWithFormat:
-                                    @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d",
+                                    @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d Strict",
                                     fTitle->width, fTitle->height, output_width, output_height, display_width, output_height]];
         displaySize.width *= ( ( CGFloat )fTitle->job->anamorphic.par_width ) / ( ( CGFloat )fTitle->job->anamorphic.par_height );   
     }
@@ -241,7 +238,7 @@ return YES;
     hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
         display_width = output_width * output_par_width / output_par_height;
         [fInfoField setStringValue:[NSString stringWithFormat:
-                                    @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d",
+                                    @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d Loose",
                                     fTitle->width, fTitle->height, output_width, output_height, display_width, output_height]];
         
         displaySize.width = display_width;
@@ -252,7 +249,8 @@ return YES;
                                      @"Source: %dx%d, Output: %dx%d", fTitle->width, fTitle->height,
                                      fTitle->job->width, fTitle->job->height]];
     }
-
+    
+    
     NSSize viewSize = [self optimalViewSizeForImageSize:displaySize];
     /* we also need to take into account scaling to full screen to activate switching the view size */
     if( [self viewNeedsToResizeToSize:viewSize])
@@ -349,6 +347,11 @@ return YES;
     
 }
 
+- (NSString*) pictureSizeInfoString
+{
+    return [fInfoField stringValue];
+}
+
 - (IBAction)showPictureSettings:(id)sender
 {
     [fHBController showPicturePanel:self];