projects / handbrake / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a972b47)
MacGui: Video Filter and Picture Settings
authordynaflash <dynaflashtech@gmail.com>
Fri, 6 Feb 2009 19:05:21 +0000 (19:05 +0000)
committerdynaflash <dynaflashtech@gmail.com>
Fri, 6 Feb 2009 19:05:21 +0000 (19:05 +0000)
- 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

macosx/Controller.h patch | blob | history
macosx/Controller.mm patch | blob | history
macosx/English.lproj/MainMenu.xib patch | blob | history
macosx/English.lproj/PictureSettings.xib patch | blob | history
macosx/HBPreviewController.h patch | blob | history
macosx/HBPreviewController.mm patch | blob | history
macosx/HBQueueController.mm patch | blob | history
macosx/PictureController.h patch | blob | history
macosx/PictureController.mm patch | blob | history

diff --git a/macosx/Controller.h b/macosx/Controller.h
index cfabdda437e8014056f4ae6e4fd54afa20bb10cc..e77aa9ad1be1f4062787481fc16e012c5ccf0e6e 100644 (file)
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -109,32 +109,12 @@ BOOL                        fIsDragging;
     IBOutlet NSButton            * fVidTwoPassCheck;
     IBOutlet NSButton            * fVidTurboPassCheck;
        
-       /* Picture Settings box */
-    IBOutlet NSTextField         * fPicLabelSettings;
-       IBOutlet NSTextField         * fPicLabelSrc;
-    IBOutlet NSTextField         * fPicSettingsSrc;
-       IBOutlet NSTextField         * fPicLabelOutp;
-    IBOutlet NSTextField         * fPicSettingsOutp;
-    IBOutlet NSTextField         * fPicLabelAnamorphic;
-    IBOutlet NSTextField         * fPicSettingsAnamorphic;
-    
-    IBOutlet NSTextField         * fPicLabelAr;
-       IBOutlet NSTextField         * fPicLabelAutoCrop;
-    IBOutlet NSTextField         * fPicLabelDetelecine;
-       IBOutlet NSTextField         * fPicLabelDeinterlace;
-    IBOutlet NSTextField         * fPicLabelDecomb;
-    IBOutlet NSTextField         * fPicLabelDenoise;
-    IBOutlet NSTextField         * fPicLabelDeblock;
-       IBOutlet NSTextField         * fPicSettingDeinterlace;
-    IBOutlet NSTextField         * fPicSettingDecomb;
-       IBOutlet NSTextField         * fPicSettingARkeep;
-       IBOutlet NSTextField         * fPicSettingPAR;
-       IBOutlet NSTextField         * fPicSettingAutoCrop;
-       IBOutlet NSTextField         * fPicSettingDetelecine;
-       IBOutlet NSTextField         * fPicSettingDenoise;
-    IBOutlet NSTextField         * fPicSettingDeblock;
-    IBOutlet NSTextField         * fPicLabelGrayscale;
-    IBOutlet NSTextField         * fPicSettingGrayscale;
+       /* Status read out fileds for picture sizing */
+    IBOutlet NSTextField         * fPictureSizeField;
+    IBOutlet NSTextField         * fPictureCroppingField;
+       
+    /* Status read out fileds for video filters */
+    IBOutlet NSTextField         * fVideoFiltersField;
        
        /* Picture variables */
        int                        PicOrigOutputWidth;
@@ -240,7 +220,8 @@ BOOL                        fIsDragging;
     NSMutableDictionary          *presetUserDefaultParentParent;
     int                        presetCurrentBuiltInCount; // keeps track of the current number of built in presets
     IBOutlet NSPanel             * fAddPresetPanel;
-       /* new NSOutline View for the presets */
+       
+    /* NSOutline View for the presets */
     NSArray                      *fDraggedNodes;
     IBOutlet HBPresetsOutlineView * fPresetsOutlineView;
     IBOutlet NSButton            * fPresetsAdd;
@@ -249,6 +230,7 @@ BOOL                        fIsDragging;
 
     hb_handle_t                  * fHandle;
     
+    /* Queue variables */
     hb_handle_t              * fQueueEncodeLibhb;           // libhb for HB Encoding
        hb_title_t                   * fTitle;
     hb_title_t                   * fQueueEncodeTitle;
@@ -269,6 +251,7 @@ BOOL                        fIsDragging;
        NSString                      * currentSource;
     NSString                     * browsedSourceDisplayName;
 }
+
 - (void) writeToActivityLog:(char *) format, ...;
 - (IBAction) browseSources: (id) sender;
 - (void) browseSourcesDone: (NSOpenPanel *) sheet
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 188dc309aa6d48d1d043a0da8d1c4d9a49ba549b..a8e0e9ef72f891729759aa2e5e6b1fe0061e14cf 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -416,13 +416,12 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
 - (void) enableUI: (bool) b
 {
     NSControl * controls[] =
-      { fSrcTitleField, fSrcTitlePopUp,
+    { fSrcTitleField, fSrcTitlePopUp,
         fSrcChapterField, fSrcChapterStartPopUp, fSrcChapterToField,
         fSrcChapterEndPopUp, fSrcDuration1Field, fSrcDuration2Field,
         fDstFormatField, fDstFormatPopUp, fDstFile1Field, fDstFile2Field,
-        fDstBrowseButton, fVidRateField, fVidRatePopUp,
-        fVidEncoderField, fVidEncoderPopUp, fVidQualityField,
-        fVidQualityMatrix, fSubField, fSubPopUp,
+        fDstBrowseButton, fVidRateField, fVidRatePopUp,fVidEncoderField, fVidEncoderPopUp, fVidQualityField,
+        fPictureSizeField,fPictureCroppingField, fVideoFiltersField,fVidQualityMatrix, fSubField, fSubPopUp,
         fAudSourceLabel, fAudCodecLabel, fAudMixdownLabel, fAudSamplerateLabel, fAudBitrateLabel,
         fAudTrack1Label, fAudTrack2Label, fAudTrack3Label, fAudTrack4Label,
         fAudLang1PopUp, fAudLang2PopUp, fAudLang3PopUp, fAudLang4PopUp,
@@ -432,16 +431,12 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
         fAudTrack1BitratePopUp, fAudTrack2BitratePopUp, fAudTrack3BitratePopUp, fAudTrack4BitratePopUp,
         fAudDrcLabel, fAudTrack1DrcSlider, fAudTrack1DrcField, fAudTrack2DrcSlider,
         fAudTrack2DrcField, fAudTrack3DrcSlider, fAudTrack3DrcField, fAudTrack4DrcSlider,fAudTrack4DrcField,
-        fQueueStatus,fPicSettingARkeep, fPicSettingDeinterlace,fPicLabelSettings,fPicLabelSrc,
-        fPicLabelOutp,fPicSettingsSrc,fPicSettingsOutp,fPicSettingsAnamorphic,
-               fPicLabelAr,fPicLabelDeinterlace,fPicSettingPAR,fPicLabelAnamorphic,fPresetsAdd,fPresetsDelete,
-               fCreateChapterMarkers,fVidTurboPassCheck,fDstMp4LargeFileCheck,fPicLabelAutoCrop,
-               fPicSettingAutoCrop,fPicSettingDetelecine,fPicLabelDetelecine,fPicLabelDenoise,fPicSettingDenoise,
-        fSubForcedCheck,fPicSettingDeblock,fPicLabelDeblock,fPicLabelDecomb,fPicSettingDecomb,fPresetsOutlineView,
-        fPicLabelGrayscale,fPicSettingGrayscale,fAudDrcLabel,fDstMp4HttpOptFileCheck,fDstMp4iPodFileCheck};
-
+        fQueueStatus,fPresetsAdd,fPresetsDelete,
+               fCreateChapterMarkers,fVidTurboPassCheck,fDstMp4LargeFileCheck,fSubForcedCheck,fPresetsOutlineView,
+    fAudDrcLabel,fDstMp4HttpOptFileCheck,fDstMp4iPodFileCheck};
+    
     for( unsigned i = 0;
-         i < sizeof( controls ) / sizeof( NSControl * ); i++ )
+        i < sizeof( controls ) / sizeof( NSControl * ); i++ )
     {
         if( [[controls[i] className] isEqualToString: @"NSTextField"] )
         {
@@ -449,28 +444,28 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
             if( ![tf isBezeled] )
             {
                 [tf setTextColor: b ? [NSColor controlTextColor] :
-                    [NSColor disabledControlTextColor]];
+                 [NSColor disabledControlTextColor]];
                 continue;
             }
         }
         [controls[i] setEnabled: b];
-
+        
     }
-
+    
        if (b) {
-
+        
         /* if we're enabling the interface, check if the audio mixdown controls need to be enabled or not */
         /* these will have been enabled by the mass control enablement above anyway, so we're sense-checking it here */
         [self setEnabledStateOfAudioMixdownControls:nil];
         /* we also call calculatePictureSizing here to sense check if we already have vfr selected */
         [self calculatePictureSizing:nil];
-
+        
        } else {
-
+        
                [fPresetsOutlineView setEnabled: NO];
-
+        
        }
-
+    
     [self videoMatrixChanged:nil];
     [fAdvancedOptions enableUI:b];
 }
@@ -1910,10 +1905,7 @@ fWorkingCount = 0;
        [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->keep_ratio] forKey:@"PictureKeepRatio"];
        [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.mode] forKey:@"PicturePAR"];
     NSString * pictureSummary;
-    pictureSummary = [NSString stringWithFormat:@"Source: %@ Output: %@ Anamorphic: %@", 
-                     [fPicSettingsSrc stringValue], 
-                     [fPicSettingsOutp stringValue], 
-                     [fPicSettingsAnamorphic stringValue]];
+    pictureSummary = [fPictureSizeField stringValue];
     [queueFileJob setObject:pictureSummary forKey:@"PictureSizingSummary"];                 
     /* Set crop settings here */
        [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController autoCrop]] forKey:@"PictureAutoCrop"];
@@ -2024,7 +2016,7 @@ fWorkingCount = 0;
        [queueFileJob setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
     
     /* Picture Filters */
-    [queueFileJob setObject:[fPicSettingDecomb stringValue] forKey:@"JobPictureDecomb"];
+    //[queueFileJob setObject:[fPicSettingDecomb stringValue] forKey:@"JobPictureDecomb"];
     
     /*Audio*/
     if ([fAudLang1PopUp indexOfSelectedItem] > 0)
@@ -3643,10 +3635,7 @@ fWorkingCount = 0;
        hb_job_t * job = title->job;
        fTitle = title;
     
-    /*Set Source Size Field Here */
-    [fPicSettingsSrc setStringValue: [NSString stringWithFormat: @"%d x %d", fTitle->width, fTitle->height]];
-       
-       /* Set Auto Crop to on upon selecting a new title  */
+    /* Set Auto Crop to on upon selecting a new title  */
     [fPictureController setAutoCrop:YES];
     
        /* We get the originial output picture width and height and put them
@@ -4183,104 +4172,54 @@ the user is using "Custom" settings by determining the sender*/
 /* Get and Display Current Pic Settings in main window */
 - (IBAction) calculatePictureSizing: (id) sender
 {
-       [fPicSettingsOutp setStringValue: [NSString stringWithFormat:@"%d x %d", fTitle->job->width, fTitle->job->height]];
-       
-    if (fTitle->job->anamorphic.mode == 1)
-       {
-        int titlewidth = fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3];
-        int arpwidth = fTitle->job->anamorphic.par_width;
-        int arpheight = fTitle->job->anamorphic.par_height;
-        int displayparwidth = titlewidth * arpwidth / arpheight;
-        int displayparheight = fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1];
-        [fPicSettingsOutp setStringValue: [NSString stringWithFormat:@"%d x %d", titlewidth, displayparheight]];
-        [fPicSettingsAnamorphic setStringValue: [NSString stringWithFormat:@"%d x %d Strict", displayparwidth, displayparheight]];
-        fTitle->job->keep_ratio = 0;
-       }
-    else if (fTitle->job->anamorphic.mode == 2)
-    {
-        hb_job_t * job = fTitle->job;
-        int output_width, output_height, output_par_width, output_par_height;
-        hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
-        int display_width;
-        display_width = output_width * output_par_width / output_par_height;
-
-        [fPicSettingsOutp setStringValue: [NSString stringWithFormat:@"%d x %d", output_width, output_height]];
-        [fPicSettingsAnamorphic setStringValue: [NSString stringWithFormat:@"%d x %d Loose", display_width, output_height]];
-
-        fTitle->job->keep_ratio = 0;
-    }
-       else
-       {
-        [fPicSettingsAnamorphic setStringValue:@"Off"];
-       }
-
-       /* Set ON/Off values for the deinterlace/keep aspect ratio according to boolean */
-       if (fTitle->job->keep_ratio > 0)
-       {
-               [fPicSettingARkeep setStringValue: @"On"];
-       }
-       else
-       {
-               [fPicSettingARkeep setStringValue: @"Off"];
-       }       
-
        if (fTitle->job->anamorphic.mode > 0)
        {
-               [fPicSettingPAR setStringValue: @""];
-       }
-       else
-       {
-               [fPicSettingPAR setStringValue: @"Off"];
+        fTitle->job->keep_ratio = 0;
        }
-       
+    
+    [fPictureSizeField setStringValue: [NSString stringWithFormat:@"Picture Size: %@", [fPictureController getPictureSizeInfoString]]];
+    
+    NSString *picCropping;
     /* Set the display field for crop as per boolean */
        if (![fPictureController autoCrop])
        {
-           [fPicSettingAutoCrop setStringValue: @"Custom"];
+        picCropping =  @"Custom";
        }
        else
        {
-               [fPicSettingAutoCrop setStringValue: @"Auto"];
+               picCropping =  @"Auto";
        }
-
+    picCropping = [picCropping stringByAppendingString:[NSString stringWithFormat:@" %d/%d/%d/%d",fTitle->job->crop[0],fTitle->job->crop[1],fTitle->job->crop[2],fTitle->job->crop[3]]];
+    
+    [fPictureCroppingField setStringValue: [NSString stringWithFormat:@"Picture Cropping: %@",picCropping]];
     
+    NSString *videoFilters;
+    videoFilters = @"";
     /* Detelecine */
-    if ([fPictureFilterController detelecine] == 0) 
+    if ([fPictureFilterController detelecine] == 1) 
     {
-        [fPicSettingDetelecine setStringValue: @"Off"];
-    }
-    else if ([fPictureFilterController detelecine] == 1) 
-    {
-        [fPicSettingDetelecine setStringValue: @"Default"];
+        videoFilters = [videoFilters stringByAppendingString:@" - Detelecine (Default)"];
     }
     else if ([fPictureFilterController detelecine] == 2) 
     {
-        [fPicSettingDetelecine setStringValue: @"Custom"];
+        videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Detelecine (%@)",[fPictureFilterController detelecineCustomString]]];
     }
     
     
     if ([fPictureFilterController useDecomb] == 1)
     {
-        [fPicSettingDeinterlace setStringValue: @"Off"];
         /* Decomb */
-        if ([fPictureFilterController decomb] == 0)
-        {
-            //[fPicSettingDecomb setStringValue: @"1:2:6:9:80:16:16"];
-            [fPicSettingDecomb setStringValue: @"Off"];
-        }
-        else if ([fPictureFilterController decomb] == 1)
+        if ([fPictureFilterController decomb] == 1)
         {
-            [fPicSettingDecomb setStringValue: @"Default"];
+            videoFilters = [videoFilters stringByAppendingString:@" - Decomb (Default)"];
         }
         else if ([fPictureFilterController decomb] == 2)
         {
-            [fPicSettingDecomb setStringValue: @"Custom"];
+            videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Decomb (%@)",[fPictureFilterController decombCustomString]]];
         }
     }
     else
     {
-        
-        [fPicSettingDecomb setStringValue: @"Off"];
         /* Deinterlace */
         if ([fPictureFilterController deinterlace] > 0)
         {
@@ -4291,92 +4230,57 @@ the user is using "Custom" settings by determining the sender*/
             fTitle->job->deinterlace  = 0;
         }
         
-        
-        if ([fPictureFilterController deinterlace] == 0)
-        {
-            [fPicSettingDeinterlace setStringValue: @"Off"];
-        }
-        else if ([fPictureFilterController deinterlace] == 1)
+        if ([fPictureFilterController deinterlace] == 1)
         {
-            [fPicSettingDeinterlace setStringValue: @"Fast"];
+            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Fast)"];
         }
         else if ([fPictureFilterController deinterlace] == 2)
         {
-            [fPicSettingDeinterlace setStringValue: @"Slow"];
+            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slow)"];
         }
         else if ([fPictureFilterController deinterlace] == 3)
         {
-            [fPicSettingDeinterlace setStringValue: @"Slower"];
+            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slower)"];
         }
         else if ([fPictureFilterController deinterlace] == 4)
         {
-            [fPicSettingDeinterlace setStringValue: @"Custom"];
+            videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Deinterlace (%@)",[fPictureFilterController deinterlaceCustomString]]];
         }
        }
     
-               
+    
     /* Denoise */
-       if ([fPictureFilterController denoise] == 0)
-       {
-               [fPicSettingDenoise setStringValue: @"Off"];
-       }
-       else if ([fPictureFilterController denoise] == 1)
+       if ([fPictureFilterController denoise] == 1)
        {
-               [fPicSettingDenoise setStringValue: @"Weak"];
-       }
+               videoFilters = [videoFilters stringByAppendingString:@" - Denoise (Weak)"];
+    }
        else if ([fPictureFilterController denoise] == 2)
        {
-               [fPicSettingDenoise setStringValue: @"Medium"];
-       }
+               videoFilters = [videoFilters stringByAppendingString:@" - Denoise (Medium)"];
+    }
        else if ([fPictureFilterController denoise] == 3)
        {
-               [fPicSettingDenoise setStringValue: @"Strong"];
+               videoFilters = [videoFilters stringByAppendingString:@" - Denoise (Strong)"];
        }
     else if ([fPictureFilterController denoise] == 4)
        {
-               [fPicSettingDenoise setStringValue: @"Custom"];
+               videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Denoise (%@)",[fPictureFilterController denoiseCustomString]]];
        }
     
     /* Deblock */
-    if ([fPictureFilterController deblock] == 0) 
+    if ([fPictureFilterController deblock] > 0) 
     {
-        [fPicSettingDeblock setStringValue: @"Off"];
-    }
-    else 
-    {
-        [fPicSettingDeblock setStringValue: [NSString stringWithFormat:@"%d",[fPictureFilterController deblock]]];
+        videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Deblock (%d)",[fPictureFilterController deblock]]];
     }
        
-        /* Grayscale */
+    /* Grayscale */
     if ([fPictureFilterController grayscale]) 
     {
-        [fPicSettingGrayscale setStringValue: @"On"];
+        videoFilters = [videoFilters stringByAppendingString:@" - Grayscale"];
     }
-    else 
-    {
-        [fPicSettingGrayscale setStringValue: @"Off"];
-    }
-       
-    if (fTitle->job->anamorphic.mode > 0)
-       {
-               [fPicSettingPAR setStringValue: @""];
-       }
-       else
-       {
-               [fPicSettingPAR setStringValue: @"Off"];
-       }
-       
-    /* Set the display field for crop as per boolean */
-       if (![fPictureController autoCrop])
-       {
-           [fPicSettingAutoCrop setStringValue: @"Custom"];
-       }
-       else
-       {
-               [fPicSettingAutoCrop setStringValue: @"Auto"];
-       }               
-  
-  [fPictureController reloadStillPreview]; 
+    [fVideoFiltersField setStringValue: [NSString stringWithFormat:@"Video Filters: %@", videoFilters]];
+    
+    [fPictureController reloadStillPreview]; 
 }
 
 
@@ -5938,9 +5842,9 @@ return YES;
              * specified, in which case we use decomb and ignore any possible Deinterlace settings as using both was less than
              * sane.
              */
+            [fPictureFilterController setUseDecomb:1];
             [fPictureFilterController setDecomb:0];
             [fPictureFilterController setDeinterlace:0];
-            [fPictureFilterController setUseDecomb:1];
             if ([[chosenPreset objectForKey:@"PictureDecombDeinterlace"] intValue] == 1 || [[chosenPreset objectForKey:@"PictureDecomb"] intValue] > 0)
             {
                 /* we are using decomb */
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index 805ffe3cd58ee03cf59316e5c5f9a8763f475495..87403ce94bbd540905972dd301a755b0cdb57e65 100644 (file)
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -8,7 +8,7 @@
                <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="29"/>
+                       <integer value="1478"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -49,7 +49,7 @@
                                <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
                                <string key="NSWindowContentMinSize">{213, 107}</string>
                                <object class="NSView" key="NSWindowView" id="168918359">
-                                       <nil key="NSNextResponder"/>
+                                       <reference key="NSNextResponder"/>
                                        <int key="NSvFlags">256</int>
                                        <object class="NSMutableArray" key="NSSubviews">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -285,140 +285,18 @@
                                                                                                        <bool key="NSVertical">NO</bool>
                                                                                                </object>
                                                                                        </object>
-                                                                                       <object class="NSTextField" id="219409733">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{14, 119}, {93, 17}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="215270136">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents">Picture Settings</string>
-                                                                                                       <object class="NSFont" key="NSSupport" id="27">
-                                                                                                               <string key="NSName">LucidaGrande-Bold</string>
-                                                                                                               <double key="NSSize">1.100000e+01</double>
-                                                                                                               <int key="NSfFlags">3357</int>
-                                                                                                       </object>
-                                                                                                       <reference key="NSControlView" ref="219409733"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="373965512">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{14, 99}, {96, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="656776160">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Source:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="373965512"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="917474208">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{14, 77}, {96, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="1021257184">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Output:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="917474208"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="946417297">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{246, 99}, {100, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="531090746">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Keep aspect ratio:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="946417297"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="982947780">
+                                                                                       <object class="NSTextField" id="987137669">
                                                                                                <reference key="NSNextResponder" ref="1053078401"/>
                                                                                                <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{354, 99}, {47, 14}}</string>
+                                                                                               <string key="NSFrame">{{14, 63}, {686, 14}}</string>
                                                                                                <reference key="NSSuperview" ref="1053078401"/>
                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="86719269">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents"/>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="982947780"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSBox" id="839994488">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{115, 125}, {582, 5}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <string key="NSOffsets">{0, 0}</string>
-                                                                                               <object class="NSTextFieldCell" key="NSTitleCell">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">0</int>
-                                                                                                       <string key="NSContents">Box</string>
-                                                                                                       <reference key="NSSupport" ref="273283760"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="138233214"/>
-                                                                                                       <object class="NSColor" key="NSTextColor">
-                                                                                                               <int key="NSColorSpace">3</int>
-                                                                                                               <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-                                                                                                       </object>
-                                                                                               </object>
-                                                                                               <int key="NSBorderType">3</int>
-                                                                                               <int key="NSBoxType">2</int>
-                                                                                               <int key="NSTitlePosition">0</int>
-                                                                                               <bool key="NSTransparent">NO</bool>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="710962186">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{14, 55}, {96, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="26279285">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Anamorphic:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="710962186"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="145957234">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">-2147483392</int>
-                                                                                               <string key="NSFrame">{{119, 38}, {37, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="497251062">
+                                                                                               <object class="NSTextFieldCell" key="NSCell" id="537000521">
                                                                                                        <int key="NSCellFlags">67239424</int>
                                                                                                        <int key="NSCellFlags2">4194304</int>
-                                                                                                       <string key="NSContents"/>
+                                                                                                       <string key="NSContents">Picture Size: </string>
                                                                                                        <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="145957234"/>
+                                                                                                       <reference key="NSControlView" ref="987137669"/>
                                                                                                        <reference key="NSBackgroundColor" ref="242973447"/>
                                                                                                        <reference key="NSTextColor" ref="701609070"/>
                                                                                                </object>
@@ -426,239 +304,31 @@
                                                                                        <object class="NSTextField" id="690364175">
                                                                                                <reference key="NSNextResponder" ref="1053078401"/>
                                                                                                <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{312, 77}, {34, 14}}</string>
+                                                                                               <string key="NSFrame">{{14, 45}, {686, 14}}</string>
                                                                                                <reference key="NSSuperview" ref="1053078401"/>
                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                <object class="NSTextFieldCell" key="NSCell" id="508148739">
                                                                                                        <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Crop:</string>
+                                                                                                       <int key="NSCellFlags2">4194304</int>
+                                                                                                       <string key="NSContents">Picture Cropping:</string>
                                                                                                        <reference key="NSSupport" ref="26"/>
                                                                                                        <reference key="NSControlView" ref="690364175"/>
                                                                                                        <reference key="NSBackgroundColor" ref="242973447"/>
                                                                                                        <reference key="NSTextColor" ref="701609070"/>
                                                                                                </object>
                                                                                        </object>
-                                                                                       <object class="NSTextField" id="820525517">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{354, 76}, {47, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="76686465">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents"/>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="820525517"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="585235372">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{502, 99}, {56, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="782049171">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents"/>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="585235372"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="1068503811">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{502, 60}, {56, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="626403977">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents"/>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="1068503811"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="1060179806">
+                                                                                       <object class="NSTextField" id="503933842">
                                                                                                <reference key="NSNextResponder" ref="1053078401"/>
                                                                                                <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{426, 42}, {68, 14}}</string>
+                                                                                               <string key="NSFrame">{{14, 17}, {686, 14}}</string>
                                                                                                <reference key="NSSuperview" ref="1053078401"/>
                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="344072439">
+                                                                                               <object class="NSTextFieldCell" key="NSCell" id="109092334">
                                                                                                        <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Denoise:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="1060179806"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="511739402">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{502, 23}, {56, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="315802325">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents"/>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="511739402"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="458722452">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{427, 23}, {68, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="133553303">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Deblock:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="458722452"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="518784836">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{502, 7}, {56, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="262349452">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents"/>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="518784836"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="145992025">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{427, 7}, {68, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="448900448">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Grayscale:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="145992025"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="1072509220">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{502, 42}, {56, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="965262561">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents"/>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="1072509220"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="43900501">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{427, 99}, {68, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="1005519170">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Detelecine:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="43900501"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="999897202">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{427, 60}, {68, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="749563917">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Deinterlace:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="999897202"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="1017614971">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{119, 99}, {99, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="370959642">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents"/>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="1017614971"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="580175226">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{119, 77}, {99, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="82054988">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents"/>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="580175226"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="149133624">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{119, 55}, {155, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="334116173">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents"/>
+                                                                                                       <int key="NSCellFlags2">4194304</int>
+                                                                                                       <string key="NSContents">Video Filters:</string>
                                                                                                        <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="149133624"/>
+                                                                                                       <reference key="NSControlView" ref="503933842"/>
                                                                                                        <reference key="NSBackgroundColor" ref="242973447"/>
                                                                                                        <reference key="NSTextColor" ref="701609070"/>
                                                                                                </object>
@@ -816,7 +486,7 @@
                                                                                        <object class="NSTextField" id="463960465">
                                                                                                <reference key="NSNextResponder" ref="1053078401"/>
                                                                                                <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{-1, 231}, {119, 17}}</string>
+                                                                                               <string key="NSFrame">{{11, 231}, {107, 17}}</string>
                                                                                                <reference key="NSSuperview" ref="1053078401"/>
                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                <object class="NSTextFieldCell" key="NSCell" id="509250281">
@@ -845,38 +515,6 @@
                                                                                                        <reference key="NSTextColor" ref="701609070"/>
                                                                                                </object>
                                                                                        </object>
-                                                                                       <object class="NSTextField" id="946167393">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{502, 81}, {56, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="152262221">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">272629760</int>
-                                                                                                       <string key="NSContents"/>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="946167393"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="554762309">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{428, 81}, {68, 13}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="2157">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Decomb:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="554762309"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="242973447"/>
-                                                                                                       <reference key="NSTextColor" ref="701609070"/>
-                                                                                               </object>
-                                                                                       </object>
                                                                                </object>
                                                                                <string key="NSFrame">{{10, 25}, {714, 305}}</string>
                                                                                <reference key="NSSuperview" ref="712502892"/>
@@ -2662,7 +2300,11 @@
                                                                <int key="NSCellFlags">67239424</int>
                                                                <int key="NSCellFlags2">4325376</int>
                                                                <string key="NSContents">Source:</string>
-                                                               <reference key="NSSupport" ref="27"/>
+                                                               <object class="NSFont" key="NSSupport" id="27">
+                                                                       <string key="NSName">LucidaGrande-Bold</string>
+                                                                       <double key="NSSize">1.100000e+01</double>
+                                                                       <int key="NSfFlags">3357</int>
+                                                               </object>
                                                                <reference key="NSControlView" ref="586321835"/>
                                                                <reference key="NSBackgroundColor" ref="242973447"/>
                                                                <reference key="NSTextColor" ref="701609070"/>
@@ -3239,6 +2881,7 @@
                                                </object>
                                        </object>
                                        <string key="NSFrameSize">{760, 550}</string>
+                                       <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
                                <string key="NSMinSize">{213, 129}</string>
@@ -5217,38 +4860,6 @@
                                        </object>
                                        <int key="connectionID">1637</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelSrc</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="373965512"/>
-                                       </object>
-                                       <int key="connectionID">1743</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelSettings</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="219409733"/>
-                                       </object>
-                                       <int key="connectionID">1744</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelOutp</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="917474208"/>
-                                       </object>
-                                       <int key="connectionID">1745</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelAr</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="946417297"/>
-                                       </object>
-                                       <int key="connectionID">1748</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">fSubField</string>
@@ -5257,14 +4868,6 @@
                                        </object>
                                        <int key="connectionID">1758</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelAnamorphic</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="710962186"/>
-                                       </object>
-                                       <int key="connectionID">1783</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">performFindPanelAction:</string>
@@ -5671,159 +5274,79 @@
                                                <reference key="source" ref="2258723"/>
                                                <reference key="destination" ref="853234446"/>
                                        </object>
-                                       <int key="connectionID">2447</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">Rip:</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="17111946"/>
-                                       </object>
-                                       <int key="connectionID">2448</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingDetelecine</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="585235372"/>
-                                       </object>
-                                       <int key="connectionID">2459</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">videoFrameRateChanged:</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="222980245"/>
-                                       </object>
-                                       <int key="connectionID">2462</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">showPicturePanel:</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="849279674"/>
-                                       </object>
-                                       <int key="connectionID">2493</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">Pause:</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="101536867"/>
-                                       </object>
-                                       <int key="connectionID">2496</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fSubForcedCheck</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="691038230"/>
-                                       </object>
-                                       <int key="connectionID">2505</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">subtitleSelectionChanged:</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="506492318"/>
-                                       </object>
-                                       <int key="connectionID">2506</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">performClose:</string>
-                                               <reference key="source" ref="952684036"/>
-                                               <reference key="destination" ref="542310438"/>
-                                       </object>
-                                       <int key="connectionID">2509</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fAdvancedView</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="231506045"/>
-                                       </object>
-                                       <int key="connectionID">2516</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">showPreferencesWindow:</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="782330144"/>
-                                       </object>
-                                       <int key="connectionID">2517</int>
+                                       <int key="connectionID">2447</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelDetelecine</string>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">Rip:</string>
                                                <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="43900501"/>
+                                               <reference key="destination" ref="17111946"/>
                                        </object>
-                                       <int key="connectionID">2520</int>
+                                       <int key="connectionID">2448</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelAutoCrop</string>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">videoFrameRateChanged:</string>
                                                <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="690364175"/>
+                                               <reference key="destination" ref="222980245"/>
                                        </object>
-                                       <int key="connectionID">2521</int>
+                                       <int key="connectionID">2462</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelDenoise</string>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">showPicturePanel:</string>
                                                <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="1060179806"/>
+                                               <reference key="destination" ref="849279674"/>
                                        </object>
-                                       <int key="connectionID">2522</int>
+                                       <int key="connectionID">2493</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelDeinterlace</string>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">Pause:</string>
                                                <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="999897202"/>
+                                               <reference key="destination" ref="101536867"/>
                                        </object>
-                                       <int key="connectionID">2523</int>
+                                       <int key="connectionID">2496</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingDeinterlace</string>
+                                               <string key="label">fSubForcedCheck</string>
                                                <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="1068503811"/>
+                                               <reference key="destination" ref="691038230"/>
                                        </object>
-                                       <int key="connectionID">2524</int>
+                                       <int key="connectionID">2505</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingARkeep</string>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">subtitleSelectionChanged:</string>
                                                <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="982947780"/>
+                                               <reference key="destination" ref="506492318"/>
                                        </object>
-                                       <int key="connectionID">2526</int>
+                                       <int key="connectionID">2506</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingAutoCrop</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="820525517"/>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">performClose:</string>
+                                               <reference key="source" ref="952684036"/>
+                                               <reference key="destination" ref="542310438"/>
                                        </object>
-                                       <int key="connectionID">2527</int>
+                                       <int key="connectionID">2509</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingDenoise</string>
+                                               <string key="label">fAdvancedView</string>
                                                <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="1072509220"/>
+                                               <reference key="destination" ref="231506045"/>
                                        </object>
-                                       <int key="connectionID">2529</int>
+                                       <int key="connectionID">2516</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingPAR</string>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">showPreferencesWindow:</string>
                                                <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="145957234"/>
+                                               <reference key="destination" ref="782330144"/>
                                        </object>
-                                       <int key="connectionID">2531</int>
+                                       <int key="connectionID">2517</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
@@ -5857,22 +5380,6 @@
                                        </object>
                                        <int key="connectionID">2692</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelDeblock</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="458722452"/>
-                                       </object>
-                                       <int key="connectionID">2696</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingDeblock</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="511739402"/>
-                                       </object>
-                                       <int key="connectionID">2697</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">fOpenSourceTitleMMenu</string>
@@ -6057,30 +5564,6 @@
                                        </object>
                                        <int key="connectionID">4581</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingsSrc</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="1017614971"/>
-                                       </object>
-                                       <int key="connectionID">4842</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingsOutp</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="580175226"/>
-                                       </object>
-                                       <int key="connectionID">4843</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingsAnamorphic</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="149133624"/>
-                                       </object>
-                                       <int key="connectionID">4844</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">checkForUpdates:</string>
@@ -6489,22 +5972,6 @@
                                        </object>
                                        <int key="connectionID">5121</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingDecomb</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="946167393"/>
-                                       </object>
-                                       <int key="connectionID">5126</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelDecomb</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="554762309"/>
-                                       </object>
-                                       <int key="connectionID">5127</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">setDefaultPreset:</string>
@@ -6563,19 +6030,27 @@
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicSettingGrayscale</string>
+                                               <string key="label">fPictureSizeField</string>
                                                <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="518784836"/>
+                                               <reference key="destination" ref="987137669"/>
                                        </object>
-                                       <int key="connectionID">5165</int>
+                                       <int key="connectionID">5169</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPicLabelGrayscale</string>
+                                               <string key="label">fPictureCroppingField</string>
                                                <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="145992025"/>
+                                               <reference key="destination" ref="690364175"/>
+                                       </object>
+                                       <int key="connectionID">5170</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fVideoFiltersField</string>
+                                               <reference key="source" ref="2258723"/>
+                                               <reference key="destination" ref="503933842"/>
                                        </object>
-                                       <int key="connectionID">5166</int>
+                                       <int key="connectionID">5173</int>
                                </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
@@ -6889,388 +6364,176 @@
                                        <object class="IBObjectRecord">
                                                <int key="objectID">3077</int>
                                                <reference key="object" ref="460286942"/>
-                                               <reference key="parent" ref="738554558"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">3081</int>
-                                               <reference key="object" ref="124979328"/>
-                                               <reference key="parent" ref="738554558"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">3082</int>
-                                               <reference key="object" ref="844196518"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="653177228"/>
-                                               </object>
-                                               <reference key="parent" ref="738554558"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1477</int>
-                                               <reference key="object" ref="107038816"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1053078401"/>
-                                               </object>
-                                               <reference key="parent" ref="712502892"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1478</int>
-                                               <reference key="object" ref="1053078401"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="521019277"/>
-                                                       <reference ref="229000833"/>
-                                                       <reference ref="127917338"/>
-                                                       <reference ref="783405221"/>
-                                                       <reference ref="239657287"/>
-                                                       <reference ref="222980245"/>
-                                                       <reference ref="1000247853"/>
-                                                       <reference ref="447003158"/>
-                                                       <reference ref="12330413"/>
-                                                       <reference ref="463960465"/>
-                                                       <reference ref="1064150725"/>
-                                                       <reference ref="373965512"/>
-                                                       <reference ref="917474208"/>
-                                                       <reference ref="946417297"/>
-                                                       <reference ref="982947780"/>
-                                                       <reference ref="839994488"/>
-                                                       <reference ref="710962186"/>
-                                                       <reference ref="145957234"/>
-                                                       <reference ref="690364175"/>
-                                                       <reference ref="820525517"/>
-                                                       <reference ref="585235372"/>
-                                                       <reference ref="1068503811"/>
-                                                       <reference ref="511739402"/>
-                                                       <reference ref="458722452"/>
-                                                       <reference ref="43900501"/>
-                                                       <reference ref="999897202"/>
-                                                       <reference ref="1017614971"/>
-                                                       <reference ref="580175226"/>
-                                                       <reference ref="149133624"/>
-                                                       <reference ref="946167393"/>
-                                                       <reference ref="554762309"/>
-                                                       <reference ref="219409733"/>
-                                                       <reference ref="1060179806"/>
-                                                       <reference ref="1072509220"/>
-                                                       <reference ref="518784836"/>
-                                                       <reference ref="145992025"/>
-                                               </object>
-                                               <reference key="parent" ref="107038816"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1499</int>
-                                               <reference key="object" ref="521019277"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="200565868"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1500</int>
-                                               <reference key="object" ref="229000833"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="867231800"/>
-                                                       <reference ref="297078314"/>
-                                                       <reference ref="733978413"/>
-                                                       <reference ref="779990493"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1501</int>
-                                               <reference key="object" ref="867231800"/>
-                                               <reference key="parent" ref="229000833"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1502</int>
-                                               <reference key="object" ref="297078314"/>
-                                               <reference key="parent" ref="229000833"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1503</int>
-                                               <reference key="object" ref="733978413"/>
-                                               <reference key="parent" ref="229000833"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1504</int>
-                                               <reference key="object" ref="127917338"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="850340172"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1505</int>
-                                               <reference key="object" ref="783405221"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="351953267"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1506</int>
-                                               <reference key="object" ref="239657287"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="160453387"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1507</int>
-                                               <reference key="object" ref="1000247853"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="860863090"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1508</int>
-                                               <reference key="object" ref="463960465"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="509250281"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1509</int>
-                                               <reference key="object" ref="12330413"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1018849574"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1512</int>
-                                               <reference key="object" ref="222980245"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="343952154"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1515</int>
-                                               <reference key="object" ref="1064150725"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="451922400"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1714</int>
-                                               <reference key="object" ref="219409733"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="215270136"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1717</int>
-                                               <reference key="object" ref="373965512"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="656776160"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1723</int>
-                                               <reference key="object" ref="917474208"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1021257184"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
+                                               <reference key="parent" ref="738554558"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1729</int>
-                                               <reference key="object" ref="946417297"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="531090746"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
+                                               <int key="objectID">3081</int>
+                                               <reference key="object" ref="124979328"/>
+                                               <reference key="parent" ref="738554558"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1731</int>
-                                               <reference key="object" ref="999897202"/>
+                                               <int key="objectID">3082</int>
+                                               <reference key="object" ref="844196518"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="749563917"/>
+                                                       <reference ref="653177228"/>
                                                </object>
-                                               <reference key="parent" ref="1053078401"/>
+                                               <reference key="parent" ref="738554558"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1739</int>
-                                               <reference key="object" ref="982947780"/>
+                                               <int key="objectID">1477</int>
+                                               <reference key="object" ref="107038816"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="86719269"/>
+                                                       <reference ref="1053078401"/>
                                                </object>
-                                               <reference key="parent" ref="1053078401"/>
+                                               <reference key="parent" ref="712502892"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1740</int>
-                                               <reference key="object" ref="1068503811"/>
+                                               <int key="objectID">1478</int>
+                                               <reference key="object" ref="1053078401"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="626403977"/>
+                                                       <reference ref="521019277"/>
+                                                       <reference ref="229000833"/>
+                                                       <reference ref="127917338"/>
+                                                       <reference ref="783405221"/>
+                                                       <reference ref="239657287"/>
+                                                       <reference ref="222980245"/>
+                                                       <reference ref="1000247853"/>
+                                                       <reference ref="447003158"/>
+                                                       <reference ref="12330413"/>
+                                                       <reference ref="463960465"/>
+                                                       <reference ref="1064150725"/>
+                                                       <reference ref="987137669"/>
+                                                       <reference ref="690364175"/>
+                                                       <reference ref="503933842"/>
                                                </object>
-                                               <reference key="parent" ref="1053078401"/>
+                                               <reference key="parent" ref="107038816"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1753</int>
-                                               <reference key="object" ref="839994488"/>
+                                               <int key="objectID">1499</int>
+                                               <reference key="object" ref="521019277"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <object class="NSView" id="859460623">
-                                                               <nil key="NSNextResponder"/>
-                                                               <int key="NSvFlags">256</int>
-                                                               <string key="NSFrame">{{2, 2}, {125, 1}}</string>
-                                                               <reference key="NSNextKeyView" ref="946417297"/>
-                                                       </object>
+                                                       <reference ref="200565868"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1754</int>
-                                               <reference key="object" ref="859460623"/>
-                                               <reference key="parent" ref="839994488"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1772</int>
-                                               <reference key="object" ref="710962186"/>
+                                               <int key="objectID">1500</int>
+                                               <reference key="object" ref="229000833"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="26279285"/>
+                                                       <reference ref="867231800"/>
+                                                       <reference ref="297078314"/>
+                                                       <reference ref="733978413"/>
+                                                       <reference ref="779990493"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">1773</int>
-                                               <reference key="object" ref="145957234"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="497251062"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
+                                               <int key="objectID">1501</int>
+                                               <reference key="object" ref="867231800"/>
+                                               <reference key="parent" ref="229000833"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">2361</int>
-                                               <reference key="object" ref="447003158"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1070893195"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
+                                               <int key="objectID">1502</int>
+                                               <reference key="object" ref="297078314"/>
+                                               <reference key="parent" ref="229000833"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">2375</int>
-                                               <reference key="object" ref="690364175"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="508148739"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
+                                               <int key="objectID">1503</int>
+                                               <reference key="object" ref="733978413"/>
+                                               <reference key="parent" ref="229000833"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">2377</int>
-                                               <reference key="object" ref="820525517"/>
+                                               <int key="objectID">1504</int>
+                                               <reference key="object" ref="127917338"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="76686465"/>
+                                                       <reference ref="850340172"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">2451</int>
-                                               <reference key="object" ref="43900501"/>
+                                               <int key="objectID">1505</int>
+                                               <reference key="object" ref="783405221"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1005519170"/>
+                                                       <reference ref="351953267"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">2452</int>
-                                               <reference key="object" ref="585235372"/>
+                                               <int key="objectID">1506</int>
+                                               <reference key="object" ref="239657287"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="782049171"/>
+                                                       <reference ref="160453387"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">2472</int>
-                                               <reference key="object" ref="1060179806"/>
+                                               <int key="objectID">1507</int>
+                                               <reference key="object" ref="1000247853"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="344072439"/>
+                                                       <reference ref="860863090"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">2473</int>
-                                               <reference key="object" ref="1072509220"/>
+                                               <int key="objectID">1508</int>
+                                               <reference key="object" ref="463960465"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="965262561"/>
+                                                       <reference ref="509250281"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">2694</int>
-                                               <reference key="object" ref="511739402"/>
+                                               <int key="objectID">1509</int>
+                                               <reference key="object" ref="12330413"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="315802325"/>
+                                                       <reference ref="1018849574"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">2695</int>
-                                               <reference key="object" ref="458722452"/>
+                                               <int key="objectID">1512</int>
+                                               <reference key="object" ref="222980245"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="133553303"/>
+                                                       <reference ref="343952154"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4836</int>
-                                               <reference key="object" ref="1017614971"/>
+                                               <int key="objectID">1515</int>
+                                               <reference key="object" ref="1064150725"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="370959642"/>
+                                                       <reference ref="451922400"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4838</int>
-                                               <reference key="object" ref="580175226"/>
+                                               <int key="objectID">2361</int>
+                                               <reference key="object" ref="447003158"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="82054988"/>
+                                                       <reference ref="1070893195"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4840</int>
-                                               <reference key="object" ref="149133624"/>
+                                               <int key="objectID">2375</int>
+                                               <reference key="object" ref="690364175"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="334116173"/>
+                                                       <reference ref="508148739"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
@@ -8640,51 +7903,6 @@
                                                <reference key="object" ref="451922400"/>
                                                <reference key="parent" ref="1064150725"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4883</int>
-                                               <reference key="object" ref="215270136"/>
-                                               <reference key="parent" ref="219409733"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4884</int>
-                                               <reference key="object" ref="656776160"/>
-                                               <reference key="parent" ref="373965512"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4885</int>
-                                               <reference key="object" ref="1021257184"/>
-                                               <reference key="parent" ref="917474208"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4886</int>
-                                               <reference key="object" ref="531090746"/>
-                                               <reference key="parent" ref="946417297"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4887</int>
-                                               <reference key="object" ref="749563917"/>
-                                               <reference key="parent" ref="999897202"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4888</int>
-                                               <reference key="object" ref="86719269"/>
-                                               <reference key="parent" ref="982947780"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4889</int>
-                                               <reference key="object" ref="626403977"/>
-                                               <reference key="parent" ref="1068503811"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4890</int>
-                                               <reference key="object" ref="26279285"/>
-                                               <reference key="parent" ref="710962186"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4891</int>
-                                               <reference key="object" ref="497251062"/>
-                                               <reference key="parent" ref="145957234"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">4892</int>
                                                <reference key="object" ref="1070893195"/>
@@ -8695,56 +7913,6 @@
                                                <reference key="object" ref="508148739"/>
                                                <reference key="parent" ref="690364175"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4894</int>
-                                               <reference key="object" ref="76686465"/>
-                                               <reference key="parent" ref="820525517"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4895</int>
-                                               <reference key="object" ref="1005519170"/>
-                                               <reference key="parent" ref="43900501"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4896</int>
-                                               <reference key="object" ref="782049171"/>
-                                               <reference key="parent" ref="585235372"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4897</int>
-                                               <reference key="object" ref="344072439"/>
-                                               <reference key="parent" ref="1060179806"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4898</int>
-                                               <reference key="object" ref="965262561"/>
-                                               <reference key="parent" ref="1072509220"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4899</int>
-                                               <reference key="object" ref="315802325"/>
-                                               <reference key="parent" ref="511739402"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4900</int>
-                                               <reference key="object" ref="133553303"/>
-                                               <reference key="parent" ref="458722452"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4901</int>
-                                               <reference key="object" ref="370959642"/>
-                                               <reference key="parent" ref="1017614971"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4902</int>
-                                               <reference key="object" ref="82054988"/>
-                                               <reference key="parent" ref="580175226"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4903</int>
-                                               <reference key="object" ref="334116173"/>
-                                               <reference key="parent" ref="149133624"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">4904</int>
                                                <reference key="object" ref="719511430"/>
@@ -9888,34 +9056,6 @@
                                                <reference key="object" ref="941741345"/>
                                                <reference key="parent" ref="758473796"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">5122</int>
-                                               <reference key="object" ref="946167393"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="152262221"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">5123</int>
-                                               <reference key="object" ref="152262221"/>
-                                               <reference key="parent" ref="946167393"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">5124</int>
-                                               <reference key="object" ref="554762309"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="2157"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">5125</int>
-                                               <reference key="object" ref="2157"/>
-                                               <reference key="parent" ref="554762309"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">5130</int>
                                                <reference key="object" ref="886184281"/>
@@ -9985,32 +9125,32 @@
                                                <reference key="parent" ref="919178355"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5161</int>
-                                               <reference key="object" ref="518784836"/>
+                                               <int key="objectID">5167</int>
+                                               <reference key="object" ref="987137669"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="262349452"/>
+                                                       <reference ref="537000521"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5162</int>
-                                               <reference key="object" ref="145992025"/>
+                                               <int key="objectID">5168</int>
+                                               <reference key="object" ref="537000521"/>
+                                               <reference key="parent" ref="987137669"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">5171</int>
+                                               <reference key="object" ref="503933842"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="448900448"/>
+                                                       <reference ref="109092334"/>
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5163</int>
-                                               <reference key="object" ref="448900448"/>
-                                               <reference key="parent" ref="145992025"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">5164</int>
-                                               <reference key="object" ref="262349452"/>
-                                               <reference key="parent" ref="518784836"/>
+                                               <int key="objectID">5172</int>
+                                               <reference key="object" ref="109092334"/>
+                                               <reference key="parent" ref="503933842"/>
                                        </object>
                                </object>
                        </object>
@@ -10199,28 +9339,6 @@
                                        <string>1636.ImportedFromIB2</string>
                                        <string>1638.IBPluginDependency</string>
                                        <string>1638.ImportedFromIB2</string>
-                                       <string>1714.IBPluginDependency</string>
-                                       <string>1714.ImportedFromIB2</string>
-                                       <string>1717.IBPluginDependency</string>
-                                       <string>1717.ImportedFromIB2</string>
-                                       <string>1723.IBPluginDependency</string>
-                                       <string>1723.ImportedFromIB2</string>
-                                       <string>1729.IBPluginDependency</string>
-                                       <string>1729.ImportedFromIB2</string>
-                                       <string>1731.IBPluginDependency</string>
-                                       <string>1731.ImportedFromIB2</string>
-                                       <string>1739.IBPluginDependency</string>
-                                       <string>1739.ImportedFromIB2</string>
-                                       <string>1740.IBPluginDependency</string>
-                                       <string>1740.ImportedFromIB2</string>
-                                       <string>1753.IBPluginDependency</string>
-                                       <string>1753.ImportedFromIB2</string>
-                                       <string>1754.IBPluginDependency</string>
-                                       <string>1754.ImportedFromIB2</string>
-                                       <string>1772.IBPluginDependency</string>
-                                       <string>1772.ImportedFromIB2</string>
-                                       <string>1773.IBPluginDependency</string>
-                                       <string>1773.ImportedFromIB2</string>
                                        <string>1795.IBPluginDependency</string>
                                        <string>1795.ImportedFromIB2</string>
                                        <string>1796.IBPluginDependency</string>
@@ -10392,8 +9510,6 @@
                                        <string>2368.ImportedFromIB2</string>
                                        <string>2375.IBPluginDependency</string>
                                        <string>2375.ImportedFromIB2</string>
-                                       <string>2377.IBPluginDependency</string>
-                                       <string>2377.ImportedFromIB2</string>
                                        <string>240.IBPluginDependency</string>
                                        <string>240.ImportedFromIB2</string>
                                        <string>2421.IBPluginDependency</string>
@@ -10404,14 +9520,6 @@
                                        <string>2444.ImportedFromIB2</string>
                                        <string>2445.IBPluginDependency</string>
                                        <string>2445.ImportedFromIB2</string>
-                                       <string>2451.IBPluginDependency</string>
-                                       <string>2451.ImportedFromIB2</string>
-                                       <string>2452.IBPluginDependency</string>
-                                       <string>2452.ImportedFromIB2</string>
-                                       <string>2472.IBPluginDependency</string>
-                                       <string>2472.ImportedFromIB2</string>
-                                       <string>2473.IBPluginDependency</string>
-                                       <string>2473.ImportedFromIB2</string>
                                        <string>2488.IBPluginDependency</string>
                                        <string>2488.ImportedFromIB2</string>
                                        <string>2494.IBPluginDependency</string>
@@ -10436,10 +9544,6 @@
                                        <string>2672.ImportedFromIB2</string>
                                        <string>2673.IBPluginDependency</string>
                                        <string>2673.ImportedFromIB2</string>
-                                       <string>2694.IBPluginDependency</string>
-                                       <string>2694.ImportedFromIB2</string>
-                                       <string>2695.IBPluginDependency</string>
-                                       <string>2695.ImportedFromIB2</string>
                                        <string>2698.IBPluginDependency</string>
                                        <string>2698.ImportedFromIB2</string>
                                        <string>2701.IBEditorWindowLastContentRect</string>
@@ -10527,12 +9631,6 @@
                                        <string>4579.IBAttributePlaceholdersKey</string>
                                        <string>4579.IBPluginDependency</string>
                                        <string>4579.ImportedFromIB2</string>
-                                       <string>4836.IBPluginDependency</string>
-                                       <string>4836.ImportedFromIB2</string>
-                                       <string>4838.IBPluginDependency</string>
-                                       <string>4838.ImportedFromIB2</string>
-                                       <string>4840.IBPluginDependency</string>
-                                       <string>4840.ImportedFromIB2</string>
                                        <string>4846.IBPluginDependency</string>
                                        <string>4847.IBPluginDependency</string>
                                        <string>4848.IBPluginDependency</string>
@@ -10560,27 +9658,8 @@
                                        <string>4878.IBPluginDependency</string>
                                        <string>4879.IBPluginDependency</string>
                                        <string>4880.IBPluginDependency</string>
-                                       <string>4883.IBPluginDependency</string>
-                                       <string>4884.IBPluginDependency</string>
-                                       <string>4885.IBPluginDependency</string>
-                                       <string>4886.IBPluginDependency</string>
-                                       <string>4887.IBPluginDependency</string>
-                                       <string>4888.IBPluginDependency</string>
-                                       <string>4889.IBPluginDependency</string>
-                                       <string>4890.IBPluginDependency</string>
-                                       <string>4891.IBPluginDependency</string>
                                        <string>4892.IBPluginDependency</string>
                                        <string>4893.IBPluginDependency</string>
-                                       <string>4894.IBPluginDependency</string>
-                                       <string>4895.IBPluginDependency</string>
-                                       <string>4896.IBPluginDependency</string>
-                                       <string>4897.IBPluginDependency</string>
-                                       <string>4898.IBPluginDependency</string>
-                                       <string>4899.IBPluginDependency</string>
-                                       <string>4900.IBPluginDependency</string>
-                                       <string>4901.IBPluginDependency</string>
-                                       <string>4902.IBPluginDependency</string>
-                                       <string>4903.IBPluginDependency</string>
                                        <string>4904.IBPluginDependency</string>
                                        <string>4905.IBPluginDependency</string>
                                        <string>4906.IBPluginDependency</string>
@@ -10785,12 +9864,6 @@
                                        <string>5107.IBPluginDependency</string>
                                        <string>5107.ImportedFromIB2</string>
                                        <string>5108.IBPluginDependency</string>
-                                       <string>5122.IBPluginDependency</string>
-                                       <string>5122.ImportedFromIB2</string>
-                                       <string>5123.IBPluginDependency</string>
-                                       <string>5124.IBPluginDependency</string>
-                                       <string>5124.ImportedFromIB2</string>
-                                       <string>5125.IBPluginDependency</string>
                                        <string>5130.IBPluginDependency</string>
                                        <string>5131.IBPluginDependency</string>
                                        <string>5132.IBEditorWindowLastContentRect</string>
@@ -10804,12 +9877,12 @@
                                        <string>5154.IBPluginDependency</string>
                                        <string>5157.IBPluginDependency</string>
                                        <string>5159.IBPluginDependency</string>
-                                       <string>5161.IBPluginDependency</string>
-                                       <string>5161.ImportedFromIB2</string>
-                                       <string>5162.IBPluginDependency</string>
-                                       <string>5162.ImportedFromIB2</string>
-                                       <string>5163.IBPluginDependency</string>
-                                       <string>5164.IBPluginDependency</string>
+                                       <string>5167.IBPluginDependency</string>
+                                       <string>5167.ImportedFromIB2</string>
+                                       <string>5168.IBPluginDependency</string>
+                                       <string>5171.IBPluginDependency</string>
+                                       <string>5171.ImportedFromIB2</string>
+                                       <string>5172.IBPluginDependency</string>
                                        <string>56.IBPluginDependency</string>
                                        <string>56.ImportedFromIB2</string>
                                        <string>57.IBPluginDependency</string>
@@ -11072,28 +10145,6 @@
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
                                        <string>{{454, 306}, {270, 550}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="0"/>
@@ -11187,9 +10238,9 @@
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>{{257, 306}, {760, 550}}</string>
+                                       <string>{{255, 306}, {760, 550}}</string>
                                        <boolean value="YES"/>
-                                       <string>{{257, 306}, {760, 550}}</string>
+                                       <string>{{255, 306}, {760, 550}}</string>
                                        <reference ref="9"/>
                                        <string>{{65, 541}, {760, 550}}</string>
                                        <reference ref="6"/>
@@ -11250,20 +10301,6 @@
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
                                        <string>{{72, 851}, {392, 144}}</string>
                                        <string>{{72, 851}, {392, 144}}</string>
                                        <reference ref="9"/>
@@ -11357,31 +10394,6 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11622,12 +10634,6 @@
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{304, 383}, {226, 63}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11643,8 +10649,8 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
@@ -11681,7 +10687,7 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">5166</int>
+                       <int key="maxID">5173</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -11856,30 +10862,8 @@
                                                        <string>fDstMp4HttpOptFileCheck</string>
                                                        <string>fDstMp4LargeFileCheck</string>
                                                        <string>fDstMp4iPodFileCheck</string>
-                                                       <string>fPicLabelAnamorphic</string>
-                                                       <string>fPicLabelAr</string>
-                                                       <string>fPicLabelAutoCrop</string>
-                                                       <string>fPicLabelDeblock</string>
-                                                       <string>fPicLabelDecomb</string>
-                                                       <string>fPicLabelDeinterlace</string>
-                                                       <string>fPicLabelDenoise</string>
-                                                       <string>fPicLabelDetelecine</string>
-                                                       <string>fPicLabelGrayscale</string>
-                                                       <string>fPicLabelOutp</string>
-                                                       <string>fPicLabelSettings</string>
-                                                       <string>fPicLabelSrc</string>
-                                                       <string>fPicSettingARkeep</string>
-                                                       <string>fPicSettingAutoCrop</string>
-                                                       <string>fPicSettingDeblock</string>
-                                                       <string>fPicSettingDecomb</string>
-                                                       <string>fPicSettingDeinterlace</string>
-                                                       <string>fPicSettingDenoise</string>
-                                                       <string>fPicSettingDetelecine</string>
-                                                       <string>fPicSettingGrayscale</string>
-                                                       <string>fPicSettingPAR</string>
-                                                       <string>fPicSettingsAnamorphic</string>
-                                                       <string>fPicSettingsOutp</string>
-                                                       <string>fPicSettingsSrc</string>
+                                                       <string>fPictureCroppingField</string>
+                                                       <string>fPictureSizeField</string>
                                                        <string>fPresetDrawer</string>
                                                        <string>fPresetNewDesc</string>
                                                        <string>fPresetNewFolderCheck</string>
@@ -11927,6 +10911,7 @@
                                                        <string>fVidTargetSizeField</string>
                                                        <string>fVidTurboPassCheck</string>
                                                        <string>fVidTwoPassCheck</string>
+                                                       <string>fVideoFiltersField</string>
                                                        <string>fWindow</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
@@ -11983,28 +10968,6 @@
                                                        <string>NSButton</string>
                                                        <string>NSTextField</string>
                                                        <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
-                                                       <string>NSTextField</string>
                                                        <string>NSDrawer</string>
                                                        <string>NSTextField</string>
                                                        <string>NSButton</string>
@@ -12052,6 +11015,7 @@
                                                        <string>NSTextField</string>
                                                        <string>NSButton</string>
                                                        <string>NSButton</string>
+                                                       <string>NSTextField</string>
                                                        <string>NSWindow</string>
                                                </object>
                                        </object>
diff --git a/macosx/English.lproj/PictureSettings.xib b/macosx/English.lproj/PictureSettings.xib
index dcc3b9cbb4b1291beaff9b2e462d3a1fd2a6c233..99f60afac1b3e73d12fde906cabb68d818aa0b9c 100644 (file)
--- a/macosx/English.lproj/PictureSettings.xib
+++ b/macosx/English.lproj/PictureSettings.xib
@@ -8,7 +8,6 @@
                <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="5"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -37,7 +36,7 @@
                        <object class="NSWindowTemplate" id="616825745">
                                <int key="NSWindowStyleMask">8215</int>
                                <int key="NSWindowBacking">2</int>
-                               <string key="NSWindowRect">{{1211, 357}, {229, 380}}</string>
+                               <string key="NSWindowRect">{{1211, 317}, {229, 420}}</string>
                                <int key="NSWTFlags">1886913536</int>
                                <string key="NSWindowTitle">Picture Settings</string>
                                <string key="NSWindowClass">NSPanel</string>
@@ -45,7 +44,6 @@
                                        <characters key="NS.bytes">View</characters>
                                </object>
                                <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-                               <string key="NSWindowContentMinSize">{230, 500}</string>
                                <object class="NSView" key="NSWindowView" id="49161063">
                                        <reference key="NSNextResponder"/>
                                        <int key="NSvFlags">256</int>
@@ -66,6 +64,7 @@
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{110, 62}, {19, 28}}</string>
                                                                                        <reference key="NSSuperview" ref="114416973"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -108,6 +107,7 @@
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{153, 32}, {19, 28}}</string>
                                                                                        <reference key="NSSuperview" ref="114416973"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -137,6 +137,7 @@
                                                                                        <int key="NSvFlags">256</int>
                                                                                        <string key="NSFrame">{{16, 93}, {20, 40}}</string>
                                                                                        <reference key="NSSuperview" ref="114416973"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -342,6 +343,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{52, 66}, {56, 19}}</string>
                                                                                        <reference key="NSSuperview" ref="114416973"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="936113070">
                                                                                                <int key="NSCellFlags">-2075001280</int>
@@ -365,6 +367,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{52, 7}, {56, 19}}</string>
                                                                                        <reference key="NSSuperview" ref="114416973"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="634956024">
                                                                                                <int key="NSCellFlags">-2075001280</int>
@@ -382,6 +385,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{74, 32}, {19, 28}}</string>
                                                                                        <reference key="NSSuperview" ref="114416973"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -411,6 +415,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{95, 37}, {56, 19}}</string>
                                                                                        <reference key="NSSuperview" ref="114416973"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="1050606643">
                                                                                                <int key="NSCellFlags">-2075001280</int>
@@ -428,6 +433,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{16, 37}, {56, 19}}</string>
                                                                                        <reference key="NSSuperview" ref="114416973"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="904241294">
                                                                                                <int key="NSCellFlags">-2075001280</int>
@@ -445,6 +451,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{111, 2}, {19, 28}}</string>
                                                                                        <reference key="NSSuperview" ref="114416973"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -474,6 +481,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">256</int>
                                                                                        <string key="NSFrame">{{41, 116}, {68, 17}}</string>
                                                                                        <reference key="NSSuperview" ref="114416973"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="215687429">
                                                                                                <int key="NSCellFlags">67239424</int>
@@ -490,6 +498,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">256</int>
                                                                                        <string key="NSFrame">{{41, 93}, {68, 17}}</string>
                                                                                        <reference key="NSSuperview" ref="114416973"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="664940567">
                                                                                                <int key="NSCellFlags">67239424</int>
@@ -504,10 +513,12 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                        </object>
                                                                        <string key="NSFrame">{{2, 15}, {189, 144}}</string>
                                                                        <reference key="NSSuperview" ref="1064912113"/>
+                                                                       <reference key="NSWindow"/>
                                                                </object>
                                                        </object>
-                                                       <string key="NSFrame">{{17, 11}, {193, 161}}</string>
+                                                       <string key="NSFrame">{{17, 66}, {193, 161}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
+                                                       <reference key="NSWindow"/>
                                                        <string key="NSOffsets">{0, 0}</string>
                                                        <object class="NSTextFieldCell" key="NSTitleCell">
                                                                <int key="NSCellFlags">67239424</int>
@@ -546,6 +557,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">256</int>
                                                                                        <string key="NSFrame">{{14, 53}, {55, 14}}</string>
                                                                                        <reference key="NSSuperview" ref="278260513"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="863668536">
                                                                                                <int key="NSCellFlags">67239424</int>
@@ -565,6 +577,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">256</int>
                                                                                        <string key="NSFrame">{{16, 24}, {123, 17}}</string>
                                                                                        <reference key="NSSuperview" ref="278260513"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="910777593">
                                                                                                <int key="NSCellFlags">67239424</int>
@@ -584,6 +597,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{77, 51}, {62, 19}}</string>
                                                                                        <reference key="NSSuperview" ref="278260513"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="649389918">
                                                                                                <int key="NSCellFlags">-2075001280</int>
@@ -601,6 +615,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">256</int>
                                                                                        <string key="NSFrame">{{141, 25}, {18, 18}}</string>
                                                                                        <reference key="NSSuperview" ref="278260513"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -638,6 +653,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{141, 46}, {19, 28}}</string>
                                                                                        <reference key="NSSuperview" ref="278260513"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSStepperCell" key="NSCell" id="634499157">
                                                                                                <int key="NSCellFlags">917024</int>
@@ -655,6 +671,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">256</int>
                                                                                        <string key="NSFrame">{{14, 80}, {55, 14}}</string>
                                                                                        <reference key="NSSuperview" ref="278260513"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="412868245">
                                                                                                <int key="NSCellFlags">67239424</int>
@@ -671,6 +688,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{77, 78}, {62, 19}}</string>
                                                                                        <reference key="NSSuperview" ref="278260513"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="96315080">
                                                                                                <int key="NSCellFlags">-2075001280</int>
@@ -688,6 +706,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">292</int>
                                                                                        <string key="NSFrame">{{141, 73}, {19, 28}}</string>
                                                                                        <reference key="NSSuperview" ref="278260513"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -719,6 +738,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">268</int>
                                                                                        <string key="NSFrame">{{82, 0}, {100, 15}}</string>
                                                                                        <reference key="NSSuperview" ref="278260513"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -808,6 +828,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <int key="NSvFlags">268</int>
                                                                                        <string key="NSFrame">{{7, 2}, {73, 14}}</string>
                                                                                        <reference key="NSSuperview" ref="278260513"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTextFieldCell" key="NSCell" id="926890760">
                                                                                                <int key="NSCellFlags">67239488</int>
@@ -822,10 +843,12 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                        </object>
                                                                        <string key="NSFrame">{{2, 18}, {189, 110}}</string>
                                                                        <reference key="NSSuperview" ref="1011917013"/>
+                                                                       <reference key="NSWindow"/>
                                                                </object>
                                                        </object>
-                                                       <string key="NSFrame">{{19, 190}, {193, 130}}</string>
+                                                       <string key="NSFrame">{{19, 230}, {193, 130}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
+                                                       <reference key="NSWindow"/>
                                                        <string key="NSOffsets">{0, 0}</string>
                                                        <object class="NSTextFieldCell" key="NSTitleCell">
                                                                <int key="NSCellFlags">67239424</int>
@@ -847,8 +870,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <object class="NSTextField" id="726326257">
                                                        <reference key="NSNextResponder" ref="49161063"/>
                                                        <int key="NSvFlags">256</int>
-                                                       <string key="NSFrame">{{17, 307}, {68, 17}}</string>
+                                                       <string key="NSFrame">{{17, 347}, {68, 17}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
+                                                       <reference key="NSWindow"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="410204805">
                                                                <int key="NSCellFlags">67239424</int>
@@ -863,8 +887,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <object class="NSTextField" id="922381307">
                                                        <reference key="NSNextResponder" ref="49161063"/>
                                                        <int key="NSvFlags">256</int>
-                                                       <string key="NSFrame">{{19, 455}, {55, 17}}</string>
+                                                       <string key="NSFrame">{{19, 495}, {55, 17}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
+                                                       <reference key="NSWindow"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="1037100053">
                                                                <int key="NSCellFlags">67239424</int>
@@ -882,8 +907,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <object class="NSButton" id="892118626">
                                                        <reference key="NSNextResponder" ref="49161063"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{19, 344}, {57, 25}}</string>
+                                                       <string key="NSFrame">{{19, 384}, {57, 25}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
+                                                       <reference key="NSWindow"/>
                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -916,8 +942,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <object class="NSButton" id="91459209">
                                                        <reference key="NSNextResponder" ref="49161063"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{118, 344}, {84, 25}}</string>
+                                                       <string key="NSFrame">{{118, 384}, {84, 25}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
+                                                       <reference key="NSWindow"/>
                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -947,12 +974,32 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                <int key="NSPeriodicInterval">25</int>
                                                        </object>
                                                </object>
+                                               <object class="NSTextField" id="154029488">
+                                                       <reference key="NSNextResponder" ref="49161063"/>
+                                                       <int key="NSvFlags">-2147483356</int>
+                                                       <string key="NSFrame">{{16, 36}, {194, 19}}</string>
+                                                       <reference key="NSSuperview" ref="49161063"/>
+                                                       <reference key="NSWindow"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="63504302">
+                                                               <int key="NSCellFlags">-2079195584</int>
+                                                               <int key="NSCellFlags2">4457472</int>
+                                                               <string key="NSContents"/>
+                                                               <reference key="NSSupport" ref="22"/>
+                                                               <reference key="NSControlView" ref="154029488"/>
+                                                               <object class="NSColor" key="NSBackgroundColor">
+                                                                       <int key="NSColorSpace">1</int>
+                                                                       <bytes key="NSRGB">MC4yIDAuMiAwLjIAA</bytes>
+                                                               </object>
+                                                               <reference key="NSTextColor" ref="852384715"/>
+                                                       </object>
+                                               </object>
                                        </object>
-                                       <string key="NSFrameSize">{229, 380}</string>
+                                       <string key="NSFrameSize">{229, 420}</string>
                                        <reference key="NSSuperview"/>
+                                       <reference key="NSWindow"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-                               <string key="NSMinSize">{230, 519}</string>
                                <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
                        </object>
                </object>
@@ -1215,6 +1262,14 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        </object>
                                        <int key="connectionID">277</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fSizeInfoField</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="154029488"/>
+                                       </object>
+                                       <int key="connectionID">280</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -1266,6 +1321,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <reference ref="922381307"/>
                                                        <reference ref="892118626"/>
                                                        <reference ref="91459209"/>
+                                                       <reference ref="154029488"/>
                                                </object>
                                                <reference key="parent" ref="616825745"/>
                                        </object>
@@ -1698,6 +1754,20 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <reference key="object" ref="709813005"/>
                                                <reference key="parent" ref="91459209"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">278</int>
+                                               <reference key="object" ref="154029488"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="63504302"/>
+                                               </object>
+                                               <reference key="parent" ref="49161063"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">279</int>
+                                               <reference key="object" ref="63504302"/>
+                                               <reference key="parent" ref="154029488"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
@@ -1777,6 +1847,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <string>271.IBPluginDependency</string>
                                        <string>274.IBPluginDependency</string>
                                        <string>275.IBPluginDependency</string>
+                                       <string>278.IBPluginDependency</string>
+                                       <string>278.ImportedFromIB2</string>
+                                       <string>279.IBPluginDependency</string>
                                        <string>39.IBPluginDependency</string>
                                        <string>39.ImportedFromIB2</string>
                                        <string>41.IBPluginDependency</string>
@@ -1885,6 +1958,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
@@ -1900,13 +1976,13 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
-                                       <string>{{481, 445}, {229, 380}}</string>
+                                       <string>{{481, 405}, {229, 420}}</string>
                                        <reference ref="559925184"/>
-                                       <string>{{481, 445}, {229, 380}}</string>
+                                       <string>{{481, 405}, {229, 420}}</string>
                                        <reference ref="559925184"/>
                                        <string>{{221, 276}, {533, 580}}</string>
                                        <reference ref="8"/>
-                                       <reference ref="559925184"/>
+                                       <boolean value="NO"/>
                                        <string>{3.40282e+38, 3.40282e+38}</string>
                                        <string>{230, 500}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1937,7 +2013,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">277</int>
+                       <int key="maxID">280</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1993,13 +2069,13 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>fCropTopStepper</string>
                                                        <string>fHeightField</string>
                                                        <string>fHeightStepper</string>
-                                                       <string>fInfoField</string>
                                                        <string>fPictureCropBox</string>
                                                        <string>fPictureFiltersOpenButton</string>
                                                        <string>fPictureSizeBox</string>
                                                        <string>fPictureWindow</string>
                                                        <string>fPreviewOpenButton</string>
                                                        <string>fRatioCheck</string>
+                                                       <string>fSizeInfoField</string>
                                                        <string>fWidthField</string>
                                                        <string>fWidthStepper</string>
                                                </object>
@@ -2017,7 +2093,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>NSStepper</string>
                                                        <string>NSTextField</string>
                                                        <string>NSStepper</string>
-                                                       <string>NSTextField</string>
                                                        <string>NSBox</string>
                                                        <string>NSButton</string>
                                                        <string>NSBox</string>
@@ -2025,6 +2100,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>NSButton</string>
                                                        <string>NSButton</string>
                                                        <string>NSTextField</string>
+                                                       <string>NSTextField</string>
                                                        <string>NSStepper</string>
                                                </object>
                                        </object>
diff --git a/macosx/HBPreviewController.h b/macosx/HBPreviewController.h
index 28b6eb45ffbdb56f0d513f3832b05895f32cc3ba..cba262138168a258dcb4698ff878e3ee1863566f 100644 (file)
--- a/macosx/HBPreviewController.h
+++ b/macosx/HBPreviewController.h
@@ -75,10 +75,13 @@
 - (IBAction) showPreviewWindow: (id)sender;
 - (BOOL)acceptsMouseMovedEvents;
 - (void) displayPreview;
+
 - (void) showHideHudControls;
 - (IBAction) SettingsChanged: (id) sender;
 - (IBAction) pictureSliderChanged: (id) sender;
 - (IBAction)showPictureSettings:(id)sender;
+- (NSString*) pictureSizeInfoString;
+
 /* Full Screen */
 - (IBAction)toggleScreenMode:(id)sender;
 - (IBAction)toggleScaleToScreen:(id)sender;
diff --git a/macosx/HBPreviewController.mm b/macosx/HBPreviewController.mm
index 1b26e6cafbd01c6c939175b6d962d8109dadbecf..39106c9b9a906c0411d89cc16e1653579765afc6 100644 (file)
--- 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];
diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm
index 6874104c86279d741d3e98831778b44a7462f489..e530180b369dc8c802d8361251b635287266c01a 100644 (file)
--- a/macosx/HBQueueController.mm
+++ b/macosx/HBQueueController.mm
@@ -1039,16 +1039,16 @@ return ![(HBQueueOutlineView*)outlineView isDragging];
         
         NSString * pictureFilters = @"";
         BOOL pictureFiltersPresent = NO;
-        if( [[item objectForKey:@"VFR"] intValue] == 1)
+        
+        if( [[item objectForKey:@"PictureDetelecine"] intValue] == 1)
         {
             pictureFiltersPresent = YES;
-            pictureFilters = [pictureFilters stringByAppendingString:@" - VFR"];
+            pictureFilters = [pictureFilters stringByAppendingString:@" - Detelecine (Default)"];
         }
-        
-        if( [[item objectForKey:@"PictureDetelecine"] intValue] == 1 )
+        else if( [[item objectForKey:@"PictureDetelecine"] intValue] == 2)
         {
             pictureFiltersPresent = YES;
-            pictureFilters = [pictureFilters stringByAppendingString:@" - Detelecine"];
+            pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Detelecine (%@)",[item objectForKey:@"PictureDetelecineCustom"]]];
         }
         
         if( [[item objectForKey:@"PictureDecombDeinterlace"] intValue] == 1)
@@ -1059,12 +1059,12 @@ return ![(HBQueueOutlineView*)outlineView isDragging];
                 if( [[item objectForKey:@"PictureDecomb"] intValue] == 1)
                 {
                     pictureFiltersPresent = YES;
-                    pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb Default "];
+                    pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb (Default)"];
                 }
                 if( [[item objectForKey:@"PictureDecomb"] intValue] == 2)
                 {
                     pictureFiltersPresent = YES;
-                    pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb Custom "];
+                    pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Decomb (%@)",[item objectForKey:@"PictureDecombCustom"]]];
                 }
             }
         }
@@ -1075,19 +1075,19 @@ return ![(HBQueueOutlineView*)outlineView isDragging];
                 pictureFiltersPresent = YES;
                 if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 1)
                 {
-                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace: Fast "];
+                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Fast)"];
                 }
                 else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 2)
                 {
-                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace: Slow "];           
+                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Slow)"];           
                 }
                 else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 3)
                 {
-                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace: Slower "];            
+                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Slower)"];            
                 }
                 else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 4)
                 {
-                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace: Custom "];            
+                    pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Deinterlace (%@)",[item objectForKey:@"PictureDeinterlaceCustom"]]];            
                 }
                 
             }
@@ -1097,27 +1097,34 @@ return ![(HBQueueOutlineView*)outlineView isDragging];
             pictureFiltersPresent = YES;
             if ([[item objectForKey:@"PictureDenoise"] intValue] == 1)
             {
-                pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise: Weak "];
+                pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Weak)"];
             }
             else if ([[item objectForKey:@"PictureDenoise"] intValue] == 2)
             {
-                pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise: Medium "];           
+                pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Medium)"];           
             }
             else if ([[item objectForKey:@"PictureDenoise"] intValue] == 3)
             {
-                pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise: Strong "];            
+                pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Strong)"];            
             }
             else if ([[item objectForKey:@"PictureDenoise"] intValue] == 4)
             {
-                pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise: Custom "];            
+                pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Denoise (%@)",[item objectForKey:@"PictureDenoiseCustom"]]];            
             }
             
         }
         if ([[item objectForKey:@"PictureDeblock"] intValue] != 0)
         {
             pictureFiltersPresent = YES;
-            pictureFilters = [pictureFilters stringByAppendingString: [NSString stringWithFormat:@" - Deblock (pp7) (%d) ",[[item objectForKey:@"PictureDeblock"] intValue]]];
+            pictureFilters = [pictureFilters stringByAppendingString: [NSString stringWithFormat:@" - Deblock (pp7) (%d)",[[item objectForKey:@"PictureDeblock"] intValue]]];
+        }
+        
+        if ([[item objectForKey:@"VideoGrayScale"] intValue] == 1)
+        {
+            pictureFiltersPresent = YES;
+            pictureFilters = [pictureFilters stringByAppendingString:@" - Grayscale"];
         }
+        
         if (pictureFiltersPresent == YES)
         {
             [finalString appendString: @"Filters: " withAttributes:detailBoldAttr];
diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index 277fbfc257a8830cb2349aedcf2e9f77b96388d3..01dd7eebb936c2d34202ad6bb745885a5512c30b 100644 (file)
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -47,7 +47,7 @@
     IBOutlet NSStepper       * fCropRightStepper;
 
        IBOutlet NSPopUpButton   * fAnamorphicPopUp;
-    IBOutlet NSTextField     * fInfoField;
+    IBOutlet NSTextField     * fSizeInfoField;
        
     IBOutlet NSButton        * fPreviewOpenButton;
     IBOutlet NSButton        * fPictureFiltersOpenButton;
@@ -64,17 +64,7 @@
     ratio checkbox when turning anamorphic on, so it can be
     returned to the previous state when anamorphic is turned
     off */
-    BOOL    keepAspectRatioPreviousState; 
-    
-    struct {
-        int     detelecine;
-        int     deinterlace;
-        int     decomb;
-        int     denoise;
-        int     deblock;
-    } fPictureFilterSettings;
-
-
+    BOOL    keepAspectRatioPreviousState;
 }
 - (id)init;
 
@@ -89,6 +79,7 @@
 
 - (IBAction) SettingsChanged: (id) sender;
 
+- (NSString*) getPictureSizeInfoString;
 - (void)reloadStillPreview;
 
 - (BOOL) autoCrop;
diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index 4965f76f86db483406bffb76397a3dcda4c87dc1..fa76a996ab18369a0241989467506ac1efcf5762 100644 (file)
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -374,10 +374,11 @@
 
     //[fPreviewController pictureSliderChanged:nil];
     [self reloadStillPreview];
-    
-
     }
 
+    /* we get the sizing info to display from fPreviewController */
+    [fSizeInfoField setStringValue: [fPreviewController pictureSizeInfoString]];
+
     if (sender != nil)
     {
         [fHBController pictureSettingsDidChange];
@@ -385,6 +386,11 @@
     
 }
 
+- (NSString*) getPictureSizeInfoString
+{
+    return [fSizeInfoField stringValue];
+}
+
 - (void)reloadStillPreview
 { 
    hb_job_t * job = fTitle->job; 
Unnamed repository; edit this file 'description' to name the repository.