MacGui: Picture Filters Inspector enhancements

- Add custom settings fields to Detelecine, Decomb, Deinterlace, and Denoise.
- Add a two position slider to choose between Decomb and Deinterlace (can no longer run both in the macgui).
- Update Presets, Queue, and Live Preview code accordingly.
- Moved Grayscale to the Filters inspector and removed it from the main window.
- Changed the style of the buttons on both the settings and filters inspectors to better fit in with HUD.
Known Issues:
- Resizing of the inspector to show/hide the custom fields is a touch ugly.
- Setting the filter to "Custom" then not using a custom string, results in default from libhb, though should probably error trap against that actually.

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

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 453c54ebaf197cd7cd4a0b3829c39a6258f55ae8..cfabdda437e8014056f4ae6e4fd54afa20bb10cc 100644 (file)
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -106,7 +106,6 @@ BOOL                        fIsDragging;
     IBOutlet NSTextField         * fVidBitrateField;
     IBOutlet NSButtonCell        * fVidConstantCell;
     IBOutlet NSSlider            * fVidQualitySlider;
-    IBOutlet NSButton            * fVidGrayscaleCheck;
     IBOutlet NSButton            * fVidTwoPassCheck;
     IBOutlet NSButton            * fVidTurboPassCheck;
        
@@ -134,6 +133,8 @@ BOOL                        fIsDragging;
        IBOutlet NSTextField         * fPicSettingDetelecine;
        IBOutlet NSTextField         * fPicSettingDenoise;
     IBOutlet NSTextField         * fPicSettingDeblock;
+    IBOutlet NSTextField         * fPicLabelGrayscale;
+    IBOutlet NSTextField         * fPicSettingGrayscale;
        
        /* Picture variables */
        int                        PicOrigOutputWidth;

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index d185c6b5ae545e2d21a7cf7c627200d7362bd18f..33f25aa2d274e7737e41cc3ab6864bb2670c929d 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -422,7 +422,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
         fDstFormatField, fDstFormatPopUp, fDstFile1Field, fDstFile2Field,
         fDstBrowseButton, fVidRateField, fVidRatePopUp,
         fVidEncoderField, fVidEncoderPopUp, fVidQualityField,
-        fVidQualityMatrix, fVidGrayscaleCheck, fSubField, fSubPopUp,
+        fVidQualityMatrix, fSubField, fSubPopUp,
         fAudSourceLabel, fAudCodecLabel, fAudMixdownLabel, fAudSamplerateLabel, fAudBitrateLabel,
         fAudTrack1Label, fAudTrack2Label, fAudTrack3Label, fAudTrack4Label,
         fAudLang1PopUp, fAudLang2PopUp, fAudLang3PopUp, fAudLang4PopUp,
@@ -438,7 +438,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
                fCreateChapterMarkers,fVidTurboPassCheck,fDstMp4LargeFileCheck,fPicLabelAutoCrop,
                fPicSettingAutoCrop,fPicSettingDetelecine,fPicLabelDetelecine,fPicLabelDenoise,fPicSettingDenoise,
         fSubForcedCheck,fPicSettingDeblock,fPicLabelDeblock,fPicLabelDecomb,fPicSettingDecomb,fPresetsOutlineView,
-        fAudDrcLabel,fDstMp4HttpOptFileCheck,fDstMp4iPodFileCheck};
+        fPicLabelGrayscale,fPicSettingGrayscale,fAudDrcLabel,fDstMp4HttpOptFileCheck,fDstMp4iPodFileCheck};
 
     for( unsigned i = 0;
          i < sizeof( controls ) / sizeof( NSControl * ); i++ )
@@ -1897,8 +1897,6 @@ fWorkingCount = 0;
     /* Framerate */
     [queueFileJob setObject:[fVidRatePopUp titleOfSelectedItem] forKey:@"VideoFramerate"];
     
-    /* GrayScale */
-       [queueFileJob setObject:[NSNumber numberWithInt:[fVidGrayscaleCheck state]] forKey:@"VideoGrayScale"];
        /* 2 Pass Encoding */
        [queueFileJob setObject:[NSNumber numberWithInt:[fVidTwoPassCheck state]] forKey:@"VideoTwoPass"];
        /* Turbo 2 pass Encoding fVidTurboPassCheck*/
@@ -1925,11 +1923,22 @@ fWorkingCount = 0;
        [queueFileJob setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
     
     /* Picture Filters */
+    [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController detelecine]] forKey:@"PictureDetelecine"];
+    [queueFileJob setObject:[fPictureFilterController detelecineCustomString] forKey:@"PictureDetelecineCustom"];
+    
+    [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController useDecomb]] forKey:@"PictureDecombDeinterlace"];
+    [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController decomb]] forKey:@"PictureDecomb"];
+    [queueFileJob setObject:[fPictureFilterController decombCustomString] forKey:@"PictureDecombCustom"];
+    
     [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController deinterlace]] forKey:@"PictureDeinterlace"];
-       [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController detelecine]] forKey:@"PictureDetelecine"];
+    [queueFileJob setObject:[fPictureFilterController deinterlaceCustomString] forKey:@"PictureDeinterlaceCustom"];
+    
     [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController denoise]] forKey:@"PictureDenoise"];
-    [queueFileJob setObject:[NSString stringWithFormat:@"%d",[fPictureFilterController deblock]] forKey:@"PictureDeblock"]; 
-    [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController decomb]] forKey:@"PictureDecomb"];
+    [queueFileJob setObject:[fPictureFilterController denoiseCustomString] forKey:@"PictureDenoiseCustom"];
+    
+    [queueFileJob setObject:[NSString stringWithFormat:@"%d",[fPictureFilterController deblock]] forKey:@"PictureDeblock"];
+    
+    [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController grayscale]] forKey:@"VideoGrayScale"];
     
     /*Audio*/
     if ([fAudLang1PopUp indexOfSelectedItem] > 0)
@@ -2278,9 +2287,6 @@ fWorkingCount = 0;
         [fVidRatePopUp selectItemWithTitle:[queueToApply objectForKey:@"VideoFramerate"]];
     }
     
-    /* GrayScale */
-    [fVidGrayscaleCheck setState:[[queueToApply objectForKey:@"VideoGrayScale"] intValue]];
-    
     /* 2 Pass Encoding */
     [fVidTwoPassCheck setState:[[queueToApply objectForKey:@"VideoTwoPass"] intValue]];
     [self twoPassCheckboxChanged:nil];
@@ -2458,6 +2464,8 @@ fWorkingCount = 0;
     [fPictureFilterController setDeblock:[[queueToApply objectForKey:@"PictureDeblock"] intValue]];
     /* Decomb */
     [fPictureFilterController setDecomb:[[queueToApply objectForKey:@"PictureDecomb"] intValue]];
+    /* Grayscale */
+    [fPictureFilterController setGrayscale:[[queueToApply objectForKey:@"VideoGrayScale"] intValue]];
     
     [self calculatePictureSizing:nil];
     
@@ -2691,8 +2699,6 @@ fWorkingCount = 0;
             break;
     }
 
-    job->grayscale = ( [fVidGrayscaleCheck state] == NSOnState );
-
     /* Subtitle settings */
     job->subtitle = [fSubPopUp indexOfSelectedItem] - 2;
 
@@ -2777,7 +2783,22 @@ fWorkingCount = 0;
 
     
     
-    /* Filters */ 
+    /* Filters */
+    
+    /* Though Grayscale is not really a filter, per se
+     * we put it here since its in the filters panel
+     */
+     
+    if ([fPictureFilterController grayscale])
+    {
+        job->grayscale = 1;
+    }
+    else
+    {
+        job->grayscale = 0;
+    }
+    
+    /* Initialize the filters list */
     job->filters = hb_list_init();
     
     /* Now lets call the filters if applicable.
@@ -2785,40 +2806,63 @@ fWorkingCount = 0;
     */
     
        /* Detelecine */
-    if ([fPictureFilterController detelecine])
+    if ([fPictureFilterController detelecine] == 1)
     {
         hb_list_add( job->filters, &hb_filter_detelecine );
     }
-    
-    /* Decomb */
-    if ([fPictureFilterController decomb] > 0)
-    {
-        /* Run old deinterlacer fd by default */
-        //hb_filter_decomb.settings = (char *) [[fPicSettingDecomb stringValue] UTF8String];
-        hb_list_add( job->filters, &hb_filter_decomb );
-    }
-
-    
-    /* Deinterlace */
-    if ([fPictureFilterController deinterlace] == 1)
+    if ([fPictureFilterController detelecine] == 2)
     {
-        /* Run old deinterlacer fd by default */
-        hb_filter_deinterlace.settings = "-1"; 
-        hb_list_add( job->filters, &hb_filter_deinterlace );
+        /* use a custom detelecine string */
+        hb_filter_detelecine.settings = (char *) [[fPictureFilterController detelecineCustomString] UTF8String];
+        hb_list_add( job->filters, &hb_filter_detelecine );
     }
-    else if ([fPictureFilterController deinterlace] == 2)
+    if ([fPictureFilterController useDecomb] == 1)
     {
-        /* Yadif mode 0 (without spatial deinterlacing.) */
-        hb_filter_deinterlace.settings = "2"; 
-        hb_list_add( job->filters, &hb_filter_deinterlace );            
+        /* Decomb */
+        if ([fPictureFilterController decomb] == 1)
+        {
+            /* Run old deinterlacer fd by default */
+            //hb_filter_decomb.settings = (char *) [[fPicSettingDecomb stringValue] UTF8String];
+            hb_list_add( job->filters, &hb_filter_decomb );
+        }
+        /* we add the custom string if present */
+        if ([fPictureFilterController decomb] == 2)
+        {
+            /* use a custom decomb string */
+            hb_filter_decomb.settings = (char *) [[fPictureFilterController decombCustomString] UTF8String];
+            hb_list_add( job->filters, &hb_filter_decomb );
+        }
     }
-    else if ([fPictureFilterController deinterlace] == 3)
+    else
     {
-        /* Yadif (with spatial deinterlacing) */
-        hb_filter_deinterlace.settings = "0"; 
-        hb_list_add( job->filters, &hb_filter_deinterlace );            
-    }
-       
+        
+        /* Deinterlace */
+        if ([fPictureFilterController deinterlace] == 1)
+        {
+            /* Run old deinterlacer fd by default */
+            hb_filter_deinterlace.settings = "-1"; 
+            hb_list_add( job->filters, &hb_filter_deinterlace );
+        }
+        else if ([fPictureFilterController deinterlace] == 2)
+        {
+            /* Yadif mode 0 (without spatial deinterlacing.) */
+            hb_filter_deinterlace.settings = "2"; 
+            hb_list_add( job->filters, &hb_filter_deinterlace );            
+        }
+        else if ([fPictureFilterController deinterlace] == 3)
+        {
+            /* Yadif (with spatial deinterlacing) */
+            hb_filter_deinterlace.settings = "0"; 
+            hb_list_add( job->filters, &hb_filter_deinterlace );            
+        }
+        else if ([fPictureFilterController deinterlace] == 4)
+        {
+            /* we add the custom string if present */
+            hb_filter_deinterlace.settings = (char *) [[fPictureFilterController deinterlaceCustomString] UTF8String];
+            hb_list_add( job->filters, &hb_filter_deinterlace );            
+        }
+       }
+    
     /* Denoise */
        if ([fPictureFilterController denoise] == 1) // Weak in popup
        {
@@ -2835,6 +2879,12 @@ fWorkingCount = 0;
                hb_filter_denoise.settings = "7:7:5:5"; 
         hb_list_add( job->filters, &hb_filter_denoise );       
        }
+    else if ([fPictureFilterController denoise] == 4) // custom in popup
+       {
+               /* we add the custom string if present */
+        hb_filter_denoise.settings = (char *) [[fPictureFilterController denoiseCustomString] UTF8String]; 
+        hb_list_add( job->filters, &hb_filter_denoise );       
+       }
     
     /* Deblock  (uses pp7 default) */
     /* NOTE: even though there is a valid deblock setting of 0 for the filter, for 
@@ -3124,37 +3174,64 @@ fWorkingCount = 0;
     /* Detelecine */
     if ([[queueToApply objectForKey:@"PictureDetelecine"] intValue] == 1)
     {
+        //if ([queueToApply objectForKey:@"PictureDetelecineCustom"])
         hb_list_add( job->filters, &hb_filter_detelecine );
     }
-    
-    /* Decomb */
-    if ([[queueToApply objectForKey:@"PictureDecomb"] intValue] == 1)
+    if ([[queueToApply objectForKey:@"PictureDetelecine"] intValue] == 2)
     {
-        /* Run old deinterlacer fd by default */
-        //hb_filter_decomb.settings = (char *) [[queueToApply objectForKey:@"JobPictureDecomb"] UTF8String];
-        hb_list_add( job->filters, &hb_filter_decomb );
+        /* use a custom detelecine string */
+        hb_filter_detelecine.settings = (char *) [[queueToApply objectForKey:@"PictureDetelecineCustom"] UTF8String];
+        hb_list_add( job->filters, &hb_filter_detelecine );
     }
     
-    /* Deinterlace */
-    if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 1)
+    if ([[queueToApply objectForKey:@"PictureDecombDeinterlace"] intValue] == 1)
     {
-        /* Run old deinterlacer fd by default */
-        hb_filter_deinterlace.settings = "-1"; 
-        hb_list_add( job->filters, &hb_filter_deinterlace );
-    }
-    else if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 2)
-    {
-        /* Yadif mode 0 (without spatial deinterlacing.) */
-        hb_filter_deinterlace.settings = "2"; 
-        hb_list_add( job->filters, &hb_filter_deinterlace );            
+        /* Decomb */
+        if ([[queueToApply objectForKey:@"PictureDecomb"] intValue] == 1)
+        {
+            /* Run old deinterlacer fd by default */
+            hb_list_add( job->filters, &hb_filter_decomb );
+        }
+        /* we add the custom string if present */
+        if ([[queueToApply objectForKey:@"PictureDecomb"] intValue] == 2)
+        {
+            /* use a custom decomb string */
+            hb_filter_decomb.settings = (char *) [[queueToApply objectForKey:@"PictureDecombCustom"] UTF8String];
+            hb_list_add( job->filters, &hb_filter_decomb );
+        }
+        
     }
-    else if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 3)
+    else
     {
-        /* Yadif (with spatial deinterlacing) */
-        hb_filter_deinterlace.settings = "0"; 
-        hb_list_add( job->filters, &hb_filter_deinterlace );            
+        
+        /* Deinterlace */
+        if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 1)
+        {
+            /* Run old deinterlacer fd by default */
+            hb_filter_deinterlace.settings = "-1"; 
+            hb_list_add( job->filters, &hb_filter_deinterlace );
+        }
+        else if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 2)
+        {
+            /* Yadif mode 0 (without spatial deinterlacing.) */
+            hb_filter_deinterlace.settings = "2"; 
+            hb_list_add( job->filters, &hb_filter_deinterlace );            
+        }
+        else if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 3)
+        {
+            /* Yadif (with spatial deinterlacing) */
+            hb_filter_deinterlace.settings = "0"; 
+            hb_list_add( job->filters, &hb_filter_deinterlace );            
+        }
+        else if ([[queueToApply objectForKey:@"PictureDeinterlace"] intValue] == 4)
+        {
+            /* we add the custom string if present */
+            hb_filter_deinterlace.settings = (char *) [[queueToApply objectForKey:@"PictureDeinterlaceCustom"] UTF8String];
+            hb_list_add( job->filters, &hb_filter_deinterlace );            
+        }
+        
+        
     }
-       
     /* Denoise */
        if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] == 1) // Weak in popup
        {
@@ -3171,6 +3248,12 @@ fWorkingCount = 0;
                hb_filter_denoise.settings = "7:7:5:5"; 
         hb_list_add( job->filters, &hb_filter_denoise );       
        }
+    else if ([[queueToApply objectForKey:@"PictureDenoise"] intValue] == 4) // Custom in popup
+       {
+               /* we add the custom string if present */
+        hb_filter_denoise.settings = (char *) [[queueToApply objectForKey:@"PictureDenoiseCustom"] UTF8String];
+        hb_list_add( job->filters, &hb_filter_denoise );       
+       }
     
     /* Deblock  (uses pp7 default) */
     /* NOTE: even though there is a valid deblock setting of 0 for the filter, for 
@@ -4162,61 +4245,76 @@ the user is using "Custom" settings by determining the sender*/
 
     
     /* Detelecine */
-    
-        /*On Screen Notification*/
-    //int status;
-    //status = NSRunAlertPanel(@"Method Reached...",@"Click to Continue!", @"OK", nil, nil);
-    //[NSApp requestUserAttention:NSCriticalRequest];
-    
-    if ([fPictureFilterController detelecine]) 
+    if ([fPictureFilterController detelecine] == 0) 
+    {
+        [fPicSettingDetelecine setStringValue: @"Off"];
+    }
+    else if ([fPictureFilterController detelecine] == 1) 
     {
-        [fPicSettingDetelecine setStringValue: @"On"];
+        [fPicSettingDetelecine setStringValue: @"Default"];
     }
-    else 
+    else if ([fPictureFilterController detelecine] == 2) 
     {
-        [fPicSettingDetelecine setStringValue: @"Off"];
+        [fPicSettingDetelecine setStringValue: @"Custom"];
     }
     
-    /* Decomb */
-       if ([fPictureFilterController decomb])
-       {
-               //[fPicSettingDecomb setStringValue: @"1:2:6:9:80:16:16"];
-        [fPicSettingDecomb setStringValue: @"On"];
-       }
-       else
-       {
-               [fPicSettingDecomb setStringValue: @"Off"];
-       }
     
-
-    /* Deinterlace */
-    if ([fPictureFilterController deinterlace] > 0)
+    if ([fPictureFilterController useDecomb] == 1)
     {
-        fTitle->job->deinterlace  = 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)
+        {
+            [fPicSettingDecomb setStringValue: @"Default"];
+        }
+        else if ([fPictureFilterController decomb] == 2)
+        {
+            [fPicSettingDecomb setStringValue: @"Custom"];
+        }
     }
     else
     {
-        fTitle->job->deinterlace  = 0;
-    }
-    
-    
-       if ([fPictureFilterController deinterlace] == 0)
-       {
-               [fPicSettingDeinterlace setStringValue: @"Off"];
-       }
-       else if ([fPictureFilterController deinterlace] == 1)
-       {
-               [fPicSettingDeinterlace setStringValue: @"Fast"];
-       }
-       else if ([fPictureFilterController deinterlace] == 2)
-       {
-               [fPicSettingDeinterlace setStringValue: @"Slow"];
-       }
-       else if ([fPictureFilterController deinterlace] == 3)
-       {
-               [fPicSettingDeinterlace setStringValue: @"Slower"];
+        
+        [fPicSettingDecomb setStringValue: @"Off"];
+        /* Deinterlace */
+        if ([fPictureFilterController deinterlace] > 0)
+        {
+            fTitle->job->deinterlace  = 1;
+        }
+        else
+        {
+            fTitle->job->deinterlace  = 0;
+        }
+        
+        
+        if ([fPictureFilterController deinterlace] == 0)
+        {
+            [fPicSettingDeinterlace setStringValue: @"Off"];
+        }
+        else if ([fPictureFilterController deinterlace] == 1)
+        {
+            [fPicSettingDeinterlace setStringValue: @"Fast"];
+        }
+        else if ([fPictureFilterController deinterlace] == 2)
+        {
+            [fPicSettingDeinterlace setStringValue: @"Slow"];
+        }
+        else if ([fPictureFilterController deinterlace] == 3)
+        {
+            [fPicSettingDeinterlace setStringValue: @"Slower"];
+        }
+        else if ([fPictureFilterController deinterlace] == 4)
+        {
+            [fPicSettingDeinterlace setStringValue: @"Custom"];
+        }
        }
-               
+    
+               
     /* Denoise */
        if ([fPictureFilterController denoise] == 0)
        {
@@ -4234,6 +4332,10 @@ the user is using "Custom" settings by determining the sender*/
        {
                [fPicSettingDenoise setStringValue: @"Strong"];
        }
+    else if ([fPictureFilterController denoise] == 4)
+       {
+               [fPicSettingDenoise setStringValue: @"Custom"];
+       }
     
     /* Deblock */
     if ([fPictureFilterController deblock] == 0) 
@@ -4245,7 +4347,17 @@ the user is using "Custom" settings by determining the sender*/
         [fPicSettingDeblock setStringValue: [NSString stringWithFormat:@"%d",[fPictureFilterController deblock]]];
     }
        
-       if (fTitle->job->anamorphic.mode > 0)
+        /* Grayscale */
+    if ([fPictureFilterController grayscale]) 
+    {
+        [fPicSettingGrayscale setStringValue: @"On"];
+    }
+    else 
+    {
+        [fPicSettingGrayscale setStringValue: @"Off"];
+    }
+       
+    if (fTitle->job->anamorphic.mode > 0)
        {
                [fPicSettingPAR setStringValue: @""];
        }
@@ -5595,8 +5707,6 @@ return YES;
             [fVidRatePopUp selectItemWithTitle:[chosenPreset objectForKey:@"VideoFramerate"]];
         }
         
-        /* GrayScale */
-        [fVidGrayscaleCheck setState:[[chosenPreset objectForKey:@"VideoGrayScale"] intValue]];
         
         /* 2 Pass Encoding */
         [fVidTwoPassCheck setState:[[chosenPreset objectForKey:@"VideoTwoPass"] intValue]];
@@ -5822,6 +5932,17 @@ return YES;
         if ([chosenPreset objectForKey:@"UsesPictureFilters"] && [[chosenPreset objectForKey:@"UsesPictureFilters"]  intValue] > 0)
         {
             /* Filters */
+            
+            /* lets determine what to set the use decomb / deinterlace filter at */
+            if ([chosenPreset objectForKey:@"PictureDecombDeinterlace"])
+            {
+            [fPictureFilterController setUseDecomb:[[chosenPreset objectForKey:@"PictureDecombDeinterlace"] intValue]];
+            }
+            else if ([[chosenPreset objectForKey:@"PictureDecomb"] intValue] == 1)
+            {
+            [fPictureFilterController setUseDecomb:1];
+            }
+            
             /* Deinterlace */
             if ([chosenPreset objectForKey:@"PictureDeinterlace"])
             {
@@ -5879,6 +6000,15 @@ return YES;
             {
                 [fPictureFilterController setDecomb:0];
             }
+            
+            if ([[chosenPreset objectForKey:@"VideoGrayScale"] intValue] == 1)
+            {
+                [fPictureFilterController setGrayscale:1];
+            }
+            else
+            {
+                [fPictureFilterController setGrayscale:0];
+            }
         }
         /* we call SetTitle: in fPictureController so we get an instant update in the Picture Settings window */
         [fPictureController SetTitle:fTitle];
@@ -6052,8 +6182,7 @@ return YES;
         {
             [preset setObject:[fVidRatePopUp titleOfSelectedItem] forKey:@"VideoFramerate"];
         }
-        /* GrayScale */
-        [preset setObject:[NSNumber numberWithInt:[fVidGrayscaleCheck state]] forKey:@"VideoGrayScale"];
+        
         /* 2 Pass Encoding */
         [preset setObject:[NSNumber numberWithInt:[fVidTwoPassCheck state]] forKey:@"VideoTwoPass"];
         /* Turbo 2 pass Encoding fVidTurboPassCheck*/
@@ -6076,12 +6205,13 @@ return YES;
         [preset setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
         
         /* Picture Filters */
+        [preset setObject:[NSNumber numberWithInt:[fPictureFilterController useDecomb]] forKey:@"PictureDecombDeinterlace"];
         [preset setObject:[NSNumber numberWithInt:[fPictureFilterController deinterlace]] forKey:@"PictureDeinterlace"];
         [preset setObject:[NSNumber numberWithInt:[fPictureFilterController detelecine]] forKey:@"PictureDetelecine"];
-        //[preset setObject:[NSNumber numberWithInt:[fPictureFilterController vfr]] forKey:@"VFR"];
         [preset setObject:[NSNumber numberWithInt:[fPictureFilterController denoise]] forKey:@"PictureDenoise"];
         [preset setObject:[NSNumber numberWithInt:[fPictureFilterController deblock]] forKey:@"PictureDeblock"]; 
         [preset setObject:[NSNumber numberWithInt:[fPictureFilterController decomb]] forKey:@"PictureDecomb"];
+        [preset setObject:[NSNumber numberWithInt:[fPictureFilterController grayscale]] forKey:@"VideoGrayScale"];
         
         
         /*Audio*/

diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index d45725762c9e2de973b41fffd4cb1086a12651d1..42dc2fe9689086ded0d313657446b67aee232de6 100644 (file)
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -8,8 +8,7 @@
                <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="1192"/>
-                       <integer value="1478"/>
+                       <integer value="1474"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -536,6 +535,38 @@
                                                                                                        <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>
@@ -689,7 +720,7 @@
                                                                                        <object class="NSButton" id="1000247853">
                                                                                                <reference key="NSNextResponder" ref="1053078401"/>
                                                                                                <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{123, 188}, {124, 18}}</string>
+                                                                                               <string key="NSFrame">{{123, 208}, {124, 18}}</string>
                                                                                                <reference key="NSSuperview" ref="1053078401"/>
                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                <object class="NSButtonCell" key="NSCell" id="860863090">
@@ -712,7 +743,7 @@
                                                                                        <object class="NSButton" id="447003158">
                                                                                                <reference key="NSNextResponder" ref="1053078401"/>
                                                                                                <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{140, 170}, {107, 16}}</string>
+                                                                                               <string key="NSFrame">{{140, 190}, {107, 16}}</string>
                                                                                                <reference key="NSSuperview" ref="1053078401"/>
                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                <object class="NSButtonCell" key="NSCell" id="1070893195">
@@ -782,27 +813,6 @@
                                                                                                        <int key="NSArrowPosition">1</int>
                                                                                                </object>
                                                                                        </object>
-                                                                                       <object class="NSButton" id="586924601">
-                                                                                               <reference key="NSNextResponder" ref="1053078401"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{123, 210}, {133, 18}}</string>
-                                                                                               <reference key="NSSuperview" ref="1053078401"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSButtonCell" key="NSCell" id="531797832">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">131072</int>
-                                                                                                       <string key="NSContents">Grayscale encoding</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="586924601"/>
-                                                                                                       <int key="NSButtonFlags">1211912703</int>
-                                                                                                       <int key="NSButtonFlags2">2</int>
-                                                                                                       <reference key="NSAlternateImage" ref="624832340"/>
-                                                                                                       <string key="NSAlternateContents"/>
-                                                                                                       <string key="NSKeyEquivalent"/>
-                                                                                                       <int key="NSPeriodicDelay">200</int>
-                                                                                                       <int key="NSPeriodicInterval">25</int>
-                                                                                               </object>
-                                                                                       </object>
                                                                                        <object class="NSTextField" id="463960465">
                                                                                                <reference key="NSNextResponder" ref="1053078401"/>
                                                                                                <int key="NSvFlags">256</int>
@@ -838,7 +848,7 @@
                                                                                        <object class="NSTextField" id="946167393">
                                                                                                <reference key="NSNextResponder" ref="1053078401"/>
                                                                                                <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{502, 77}, {140, 18}}</string>
+                                                                                               <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">
@@ -854,7 +864,7 @@
                                                                                        <object class="NSTextField" id="554762309">
                                                                                                <reference key="NSNextResponder" ref="1053078401"/>
                                                                                                <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{428, 77}, {68, 17}}</string>
+                                                                                               <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">
@@ -5088,14 +5098,6 @@
                                        </object>
                                        <int key="connectionID">1602</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fVidGrayscaleCheck</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="586924601"/>
-                                       </object>
-                                       <int key="connectionID">1603</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">fVidQualityField</string>
@@ -5480,14 +5482,6 @@
                                        </object>
                                        <int key="connectionID">1907</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">customSettingUsed:</string>
-                                               <reference key="source" ref="2258723"/>
-                                               <reference key="destination" ref="586924601"/>
-                                       </object>
-                                       <int key="connectionID">1912</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">customSettingUsed:</string>
@@ -6568,6 +6562,22 @@
                                        </object>
                                        <int key="connectionID">5160</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fPicSettingGrayscale</string>
+                                               <reference key="source" ref="2258723"/>
+                                               <reference key="destination" ref="518784836"/>
+                                       </object>
+                                       <int key="connectionID">5165</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fPicLabelGrayscale</string>
+                                               <reference key="source" ref="2258723"/>
+                                               <reference key="destination" ref="145992025"/>
+                                       </object>
+                                       <int key="connectionID">5166</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -6919,7 +6929,6 @@
                                                        <reference ref="1000247853"/>
                                                        <reference ref="447003158"/>
                                                        <reference ref="12330413"/>
-                                                       <reference ref="586924601"/>
                                                        <reference ref="463960465"/>
                                                        <reference ref="1064150725"/>
                                                        <reference ref="373965512"/>
@@ -6945,6 +6954,8 @@
                                                        <reference ref="219409733"/>
                                                        <reference ref="1060179806"/>
                                                        <reference ref="1072509220"/>
+                                                       <reference ref="518784836"/>
+                                                       <reference ref="145992025"/>
                                                </object>
                                                <reference key="parent" ref="107038816"/>
                                        </object>
@@ -7056,15 +7067,6 @@
                                                </object>
                                                <reference key="parent" ref="1053078401"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">1516</int>
-                                               <reference key="object" ref="586924601"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="531797832"/>
-                                               </object>
-                                               <reference key="parent" ref="1053078401"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1714</int>
                                                <reference key="object" ref="219409733"/>
@@ -8639,11 +8641,6 @@
                                                <reference key="object" ref="451922400"/>
                                                <reference key="parent" ref="1064150725"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">4881</int>
-                                               <reference key="object" ref="531797832"/>
-                                               <reference key="parent" ref="586924601"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">4883</int>
                                                <reference key="object" ref="215270136"/>
@@ -9988,6 +9985,34 @@
                                                <reference key="object" ref="74583158"/>
                                                <reference key="parent" ref="919178355"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">5161</int>
+                                               <reference key="object" ref="518784836"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="262349452"/>
+                                               </object>
+                                               <reference key="parent" ref="1053078401"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">5162</int>
+                                               <reference key="object" ref="145992025"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="448900448"/>
+                                               </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"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
@@ -10076,8 +10101,6 @@
                                        <string>1514.ImportedFromIB2</string>
                                        <string>1515.IBPluginDependency</string>
                                        <string>1515.ImportedFromIB2</string>
-                                       <string>1516.IBPluginDependency</string>
-                                       <string>1516.ImportedFromIB2</string>
                                        <string>1518.IBPluginDependency</string>
                                        <string>1518.ImportedFromIB2</string>
                                        <string>1519.IBPluginDependency</string>
@@ -10538,7 +10561,6 @@
                                        <string>4878.IBPluginDependency</string>
                                        <string>4879.IBPluginDependency</string>
                                        <string>4880.IBPluginDependency</string>
-                                       <string>4881.IBPluginDependency</string>
                                        <string>4883.IBPluginDependency</string>
                                        <string>4884.IBPluginDependency</string>
                                        <string>4885.IBPluginDependency</string>
@@ -10783,6 +10805,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>56.IBPluginDependency</string>
                                        <string>56.ImportedFromIB2</string>
                                        <string>57.IBPluginDependency</string>
@@ -10910,8 +10938,6 @@
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="9"/>
                                        <string>{{673, 530}, {83, 20}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
@@ -11162,9 +11188,9 @@
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>{{146, 306}, {760, 550}}</string>
+                                       <string>{{257, 306}, {760, 550}}</string>
                                        <boolean value="YES"/>
-                                       <string>{{146, 306}, {760, 550}}</string>
+                                       <string>{{257, 306}, {760, 550}}</string>
                                        <reference ref="9"/>
                                        <string>{{65, 541}, {760, 550}}</string>
                                        <reference ref="6"/>
@@ -11434,7 +11460,6 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
@@ -11620,6 +11645,12 @@
                                        <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>
+                                       <reference ref="9"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="9"/>
                                        <string>{{75, 683}, {235, 153}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
@@ -11651,7 +11682,7 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">5160</int>
+                       <int key="maxID">5166</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -11834,6 +11865,7 @@
                                                        <string>fPicLabelDeinterlace</string>
                                                        <string>fPicLabelDenoise</string>
                                                        <string>fPicLabelDetelecine</string>
+                                                       <string>fPicLabelGrayscale</string>
                                                        <string>fPicLabelOutp</string>
                                                        <string>fPicLabelSettings</string>
                                                        <string>fPicLabelSrc</string>
@@ -11844,6 +11876,7 @@
                                                        <string>fPicSettingDeinterlace</string>
                                                        <string>fPicSettingDenoise</string>
                                                        <string>fPicSettingDetelecine</string>
+                                                       <string>fPicSettingGrayscale</string>
                                                        <string>fPicSettingPAR</string>
                                                        <string>fPicSettingsAnamorphic</string>
                                                        <string>fPicSettingsOutp</string>
@@ -11886,7 +11919,6 @@
                                                        <string>fVidConstantCell</string>
                                                        <string>fVidEncoderField</string>
                                                        <string>fVidEncoderPopUp</string>
-                                                       <string>fVidGrayscaleCheck</string>
                                                        <string>fVidQualityField</string>
                                                        <string>fVidQualityMatrix</string>
                                                        <string>fVidQualitySlider</string>
@@ -11972,6 +12004,8 @@
                                                        <string>NSTextField</string>
                                                        <string>NSTextField</string>
                                                        <string>NSTextField</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTextField</string>
                                                        <string>NSDrawer</string>
                                                        <string>NSTextField</string>
                                                        <string>NSButton</string>
@@ -12010,7 +12044,6 @@
                                                        <string>NSButtonCell</string>
                                                        <string>NSTextField</string>
                                                        <string>NSPopUpButton</string>
-                                                       <string>NSButton</string>
                                                        <string>NSTextField</string>
                                                        <string>NSMatrix</string>
                                                        <string>NSSlider</string>

diff --git a/macosx/English.lproj/PictureFilters.xib b/macosx/English.lproj/PictureFilters.xib
index 5a40fde04dd372aa93bdfc80720b67c22a4300b3..85373bde7d6544ac02c043b0c7f0ac598bb6cca1 100644 (file)
--- a/macosx/English.lproj/PictureFilters.xib
+++ b/macosx/English.lproj/PictureFilters.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="23"/>
+                       <integer value="319"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -37,7 +37,7 @@
                        <object class="NSWindowTemplate" id="616825745">
                                <int key="NSWindowStyleMask">8215</int>
                                <int key="NSWindowBacking">2</int>
-                               <string key="NSWindowRect">{{1211, 502}, {266, 373}}</string>
+                               <string key="NSWindowRect">{{1211, 508}, {267, 380}}</string>
                                <int key="NSWTFlags">1886913536</int>
                                <string key="NSWindowTitle">Picture Filters</string>
                                <string key="NSWindowClass">NSPanel</string>
@@ -51,21 +51,138 @@
                                        <int key="NSvFlags">274</int>
                                        <object class="NSMutableArray" key="NSSubviews">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSBox" id="309105014">
+                                               <object class="NSButton" id="892118626">
+                                                       <reference key="NSNextResponder" ref="49161063"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{19, 343}, {62, 25}}</string>
+                                                       <reference key="NSSuperview" ref="49161063"/>
+                                                       <object class="NSArray" key="NSViewContentFilters">
+                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                               <object class="CIColorMonochrome">
+                                                                       <object class="CIColor" key="CI_inputColor">
+                                                                               <float key="red">7.019608e-01</float>
+                                                                               <float key="green">7.019608e-01</float>
+                                                                               <float key="blue">7.019608e-01</float>
+                                                                               <float key="alpha">1.000000e+00</float>
+                                                                       </object>
+                                                                       <real value="1.000000e+00" key="CI_inputIntensity" id="559925184"/>
+                                                                       <bool key="CIEnabled">YES</bool>
+                                                               </object>
+                                                       </object>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSButtonCell" key="NSCell" id="533593716">
+                                                               <int key="NSCellFlags">67239424</int>
+                                                               <int key="NSCellFlags2">134479872</int>
+                                                               <string key="NSContents">Preview</string>
+                                                               <object class="NSFont" key="NSSupport" id="22">
+                                                                       <string key="NSName">LucidaGrande</string>
+                                                                       <double key="NSSize">9.000000e+00</double>
+                                                                       <int key="NSfFlags">3614</int>
+                                                               </object>
+                                                               <reference key="NSControlView" ref="892118626"/>
+                                                               <int key="NSButtonFlags">-2038284033</int>
+                                                               <int key="NSButtonFlags2">163</int>
+                                                               <string key="NSAlternateContents"/>
+                                                               <string key="NSKeyEquivalent"/>
+                                                               <int key="NSPeriodicDelay">200</int>
+                                                               <int key="NSPeriodicInterval">25</int>
+                                                       </object>
+                                               </object>
+                                               <object class="NSButton" id="565292660">
+                                                       <reference key="NSNextResponder" ref="49161063"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{159, 343}, {88, 25}}</string>
+                                                       <reference key="NSSuperview" ref="49161063"/>
+                                                       <object class="NSArray" key="NSViewContentFilters">
+                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                               <object class="CIColorMonochrome">
+                                                                       <object class="CIColor" key="CI_inputColor">
+                                                                               <float key="red">7.019608e-01</float>
+                                                                               <float key="green">7.019608e-01</float>
+                                                                               <float key="blue">7.019608e-01</float>
+                                                                               <float key="alpha">1.000000e+00</float>
+                                                                       </object>
+                                                                       <reference key="CI_inputIntensity" ref="559925184"/>
+                                                                       <bool key="CIEnabled">YES</bool>
+                                                               </object>
+                                                       </object>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSButtonCell" key="NSCell" id="297585337">
+                                                               <int key="NSCellFlags">67239424</int>
+                                                               <int key="NSCellFlags2">134479872</int>
+                                                               <string key="NSContents">Picture Size</string>
+                                                               <reference key="NSSupport" ref="22"/>
+                                                               <reference key="NSControlView" ref="565292660"/>
+                                                               <int key="NSButtonFlags">-2038284033</int>
+                                                               <int key="NSButtonFlags2">163</int>
+                                                               <string key="NSAlternateContents"/>
+                                                               <string key="NSKeyEquivalent"/>
+                                                               <int key="NSPeriodicDelay">200</int>
+                                                               <int key="NSPeriodicInterval">25</int>
+                                                       </object>
+                                               </object>
+                                               <object class="NSBox" id="64221025">
                                                        <reference key="NSNextResponder" ref="49161063"/>
-                                                       <int key="NSvFlags">265</int>
+                                                       <int key="NSvFlags">18</int>
                                                        <object class="NSMutableArray" key="NSSubviews">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                               <object class="NSView" id="628081139">
-                                                                       <reference key="NSNextResponder" ref="309105014"/>
+                                                               <object class="NSView" id="535027414">
+                                                                       <reference key="NSNextResponder" ref="64221025"/>
                                                                        <int key="NSvFlags">256</int>
                                                                        <object class="NSMutableArray" key="NSSubviews">
                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                               <object class="NSPopUpButton" id="346912008">
-                                                                                       <reference key="NSNextResponder" ref="628081139"/>
-                                                                                       <int key="NSvFlags">256</int>
-                                                                                       <string key="NSFrame">{{85, 193}, {110, 15}}</string>
-                                                                                       <reference key="NSSuperview" ref="628081139"/>
+                                                                               <object class="NSTextField" id="57714806">
+                                                                                       <reference key="NSNextResponder" ref="535027414"/>
+                                                                                       <int key="NSvFlags">268</int>
+                                                                                       <string key="NSFrame">{{15, 45}, {68, 17}}</string>
+                                                                                       <reference key="NSSuperview" ref="535027414"/>
+                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                       <object class="NSTextFieldCell" key="NSCell" id="456341790">
+                                                                                               <int key="NSCellFlags">67239424</int>
+                                                                                               <int key="NSCellFlags2">71303168</int>
+                                                                                               <string key="NSContents">Detelecine:</string>
+                                                                                               <object class="NSFont" key="NSSupport" id="26">
+                                                                                                       <string key="NSName">LucidaGrande</string>
+                                                                                                       <double key="NSSize">1.100000e+01</double>
+                                                                                                       <int key="NSfFlags">3100</int>
+                                                                                               </object>
+                                                                                               <reference key="NSControlView" ref="57714806"/>
+                                                                                               <object class="NSColor" key="NSBackgroundColor" id="407686733">
+                                                                                                       <int key="NSColorSpace">6</int>
+                                                                                                       <string key="NSCatalogName">System</string>
+                                                                                                       <string key="NSColorName">controlColor</string>
+                                                                                                       <object class="NSColor" key="NSColor">
+                                                                                                               <int key="NSColorSpace">3</int>
+                                                                                                               <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+                                                                                                       </object>
+                                                                                               </object>
+                                                                                               <object class="NSColor" key="NSTextColor" id="852384715">
+                                                                                                       <int key="NSColorSpace">1</int>
+                                                                                                       <bytes key="NSRGB">MSAxIDEAA</bytes>
+                                                                                               </object>
+                                                                                       </object>
+                                                                               </object>
+                                                                               <object class="NSTextField" id="212403497">
+                                                                                       <reference key="NSNextResponder" ref="535027414"/>
+                                                                                       <int key="NSvFlags">268</int>
+                                                                                       <string key="NSFrame">{{15, 22}, {68, 17}}</string>
+                                                                                       <reference key="NSSuperview" ref="535027414"/>
+                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                       <object class="NSTextFieldCell" key="NSCell" id="534181221">
+                                                                                               <int key="NSCellFlags">67239424</int>
+                                                                                               <int key="NSCellFlags2">71303168</int>
+                                                                                               <string key="NSContents">Custom:</string>
+                                                                                               <reference key="NSSupport" ref="26"/>
+                                                                                               <reference key="NSControlView" ref="212403497"/>
+                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                               <reference key="NSTextColor" ref="852384715"/>
+                                                                                       </object>
+                                                                               </object>
+                                                                               <object class="NSPopUpButton" id="125588808">
+                                                                                       <reference key="NSNextResponder" ref="535027414"/>
+                                                                                       <int key="NSvFlags">268</int>
+                                                                                       <string key="NSFrame">{{103, 46}, {110, 15}}</string>
+                                                                                       <reference key="NSSuperview" ref="535027414"/>
                                                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -76,20 +193,16 @@
                                                                                                                <float key="blue">7.019608e-01</float>
                                                                                                                <float key="alpha">1.000000e+00</float>
                                                                                                        </object>
-                                                                                                       <real value="1.000000e+00" key="CI_inputIntensity" id="559925184"/>
+                                                                                                       <real value="1.000000e+00" key="CI_inputIntensity" id="322721602"/>
                                                                                                        <bool key="CIEnabled">YES</bool>
                                                                                                </object>
                                                                                        </object>
                                                                                        <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSPopUpButtonCell" key="NSCell" id="1034367716">
+                                                                                       <object class="NSPopUpButtonCell" key="NSCell" id="628863333">
                                                                                                <int key="NSCellFlags">-2076049856</int>
                                                                                                <int key="NSCellFlags2">264192</int>
-                                                                                               <object class="NSFont" key="NSSupport" id="22">
-                                                                                                       <string key="NSName">LucidaGrande</string>
-                                                                                                       <double key="NSSize">9.000000e+00</double>
-                                                                                                       <int key="NSfFlags">3614</int>
-                                                                                               </object>
-                                                                                               <reference key="NSControlView" ref="346912008"/>
+                                                                                               <reference key="NSSupport" ref="22"/>
+                                                                                               <reference key="NSControlView" ref="125588808"/>
                                                                                                <int key="NSButtonFlags">109199615</int>
                                                                                                <int key="NSButtonFlags2">1</int>
                                                                                                <object class="NSFont" key="NSAlternateImage" id="826709342">
@@ -103,53 +216,53 @@
                                                                                                </object>
                                                                                                <int key="NSPeriodicDelay">400</int>
                                                                                                <int key="NSPeriodicInterval">75</int>
-                                                                                               <object class="NSMenuItem" key="NSMenuItem" id="937797455">
-                                                                                                       <reference key="NSMenu" ref="132523332"/>
+                                                                                               <object class="NSMenuItem" key="NSMenuItem" id="117354995">
+                                                                                                       <reference key="NSMenu" ref="943667172"/>
                                                                                                        <string key="NSTitle">Item1</string>
                                                                                                        <string key="NSKeyEquiv"/>
                                                                                                        <int key="NSKeyEquivModMask">1048576</int>
                                                                                                        <int key="NSMnemonicLoc">2147483647</int>
                                                                                                        <int key="NSState">1</int>
-                                                                                                       <object class="NSCustomResource" key="NSOnImage" id="39717236">
+                                                                                                       <object class="NSCustomResource" key="NSOnImage" id="230561202">
                                                                                                                <string key="NSClassName">NSImage</string>
                                                                                                                <string key="NSResourceName">NSMenuCheckmark</string>
                                                                                                        </object>
-                                                                                                       <object class="NSCustomResource" key="NSMixedImage" id="1010805506">
+                                                                                                       <object class="NSCustomResource" key="NSMixedImage" id="887538330">
                                                                                                                <string key="NSClassName">NSImage</string>
                                                                                                                <string key="NSResourceName">NSMenuMixedState</string>
                                                                                                        </object>
                                                                                                        <string key="NSAction">_popUpItemAction:</string>
-                                                                                                       <reference key="NSTarget" ref="1034367716"/>
+                                                                                                       <reference key="NSTarget" ref="628863333"/>
                                                                                                </object>
                                                                                                <bool key="NSMenuItemRespectAlignment">YES</bool>
-                                                                                               <object class="NSMenu" key="NSMenu" id="132523332">
+                                                                                               <object class="NSMenu" key="NSMenu" id="943667172">
                                                                                                        <object class="NSMutableString" key="NSTitle">
                                                                                                                <characters key="NS.bytes">OtherViews</characters>
                                                                                                        </object>
                                                                                                        <object class="NSMutableArray" key="NSMenuItems">
                                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                               <reference ref="937797455"/>
-                                                                                                               <object class="NSMenuItem" id="71282261">
-                                                                                                                       <reference key="NSMenu" ref="132523332"/>
+                                                                                                               <reference ref="117354995"/>
+                                                                                                               <object class="NSMenuItem" id="8089114">
+                                                                                                                       <reference key="NSMenu" ref="943667172"/>
                                                                                                                        <string key="NSTitle">Item2</string>
                                                                                                                        <string key="NSKeyEquiv"/>
                                                                                                                        <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                        <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="39717236"/>
-                                                                                                                       <reference key="NSMixedImage" ref="1010805506"/>
+                                                                                                                       <reference key="NSOnImage" ref="230561202"/>
+                                                                                                                       <reference key="NSMixedImage" ref="887538330"/>
                                                                                                                        <string key="NSAction">_popUpItemAction:</string>
-                                                                                                                       <reference key="NSTarget" ref="1034367716"/>
+                                                                                                                       <reference key="NSTarget" ref="628863333"/>
                                                                                                                </object>
-                                                                                                               <object class="NSMenuItem" id="542784764">
-                                                                                                                       <reference key="NSMenu" ref="132523332"/>
+                                                                                                               <object class="NSMenuItem" id="786951015">
+                                                                                                                       <reference key="NSMenu" ref="943667172"/>
                                                                                                                        <string key="NSTitle">Item3</string>
                                                                                                                        <string key="NSKeyEquiv"/>
                                                                                                                        <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                        <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="39717236"/>
-                                                                                                                       <reference key="NSMixedImage" ref="1010805506"/>
+                                                                                                                       <reference key="NSOnImage" ref="230561202"/>
+                                                                                                                       <reference key="NSMixedImage" ref="887538330"/>
                                                                                                                        <string key="NSAction">_popUpItemAction:</string>
-                                                                                                                       <reference key="NSTarget" ref="1034367716"/>
+                                                                                                                       <reference key="NSTarget" ref="628863333"/>
                                                                                                                </object>
                                                                                                        </object>
                                                                                                </object>
@@ -159,58 +272,79 @@
                                                                                                <int key="NSArrowPosition">1</int>
                                                                                        </object>
                                                                                </object>
-                                                                               <object class="NSTextField" id="905607845">
-                                                                                       <reference key="NSNextResponder" ref="628081139"/>
-                                                                                       <int key="NSvFlags">256</int>
-                                                                                       <string key="NSFrame">{{14, 191}, {68, 17}}</string>
-                                                                                       <reference key="NSSuperview" ref="628081139"/>
+                                                                               <object class="NSTextField" id="842296247">
+                                                                                       <reference key="NSNextResponder" ref="535027414"/>
+                                                                                       <int key="NSvFlags">268</int>
+                                                                                       <string key="NSFrame">{{104, 24}, {108, 16}}</string>
+                                                                                       <reference key="NSSuperview" ref="535027414"/>
                                                                                        <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSTextFieldCell" key="NSCell" id="522867811">
-                                                                                               <int key="NSCellFlags">67239424</int>
-                                                                                               <int key="NSCellFlags2">71303168</int>
-                                                                                               <string key="NSContents">Deinterlace:</string>
-                                                                                               <object class="NSFont" key="NSSupport" id="26">
-                                                                                                       <string key="NSName">LucidaGrande</string>
-                                                                                                       <double key="NSSize">1.100000e+01</double>
-                                                                                                       <int key="NSfFlags">3100</int>
-                                                                                               </object>
-                                                                                               <reference key="NSControlView" ref="905607845"/>
-                                                                                               <object class="NSColor" key="NSBackgroundColor" id="407686733">
+                                                                                       <object class="NSTextFieldCell" key="NSCell" id="933082508">
+                                                                                               <int key="NSCellFlags">-1804468671</int>
+                                                                                               <int key="NSCellFlags2">272892928</int>
+                                                                                               <string key="NSContents"/>
+                                                                                               <reference key="NSSupport" ref="22"/>
+                                                                                               <reference key="NSControlView" ref="842296247"/>
+                                                                                               <bool key="NSDrawsBackground">YES</bool>
+                                                                                               <object class="NSColor" key="NSBackgroundColor" id="1045124059">
                                                                                                        <int key="NSColorSpace">6</int>
                                                                                                        <string key="NSCatalogName">System</string>
-                                                                                                       <string key="NSColorName">controlColor</string>
+                                                                                                       <string key="NSColorName">textBackgroundColor</string>
                                                                                                        <object class="NSColor" key="NSColor">
                                                                                                                <int key="NSColorSpace">3</int>
-                                                                                                               <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+                                                                                                               <bytes key="NSWhite">MQA</bytes>
                                                                                                        </object>
                                                                                                </object>
-                                                                                               <object class="NSColor" key="NSTextColor" id="852384715">
-                                                                                                       <int key="NSColorSpace">1</int>
-                                                                                                       <bytes key="NSRGB">MSAxIDEAA</bytes>
+                                                                                               <object class="NSColor" key="NSTextColor" id="387185281">
+                                                                                                       <int key="NSColorSpace">6</int>
+                                                                                                       <string key="NSCatalogName">System</string>
+                                                                                                       <string key="NSColorName">textColor</string>
+                                                                                                       <object class="NSColor" key="NSColor" id="8204224">
+                                                                                                               <int key="NSColorSpace">3</int>
+                                                                                                               <bytes key="NSWhite">MAA</bytes>
+                                                                                                       </object>
                                                                                                </object>
                                                                                        </object>
                                                                                </object>
-                                                                               <object class="NSTextField" id="57714806">
-                                                                                       <reference key="NSNextResponder" ref="628081139"/>
-                                                                                       <int key="NSvFlags">256</int>
-                                                                                       <string key="NSFrame">{{13, 247}, {68, 17}}</string>
-                                                                                       <reference key="NSSuperview" ref="628081139"/>
-                                                                                       <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSTextFieldCell" key="NSCell" id="456341790">
-                                                                                               <int key="NSCellFlags">67239424</int>
-                                                                                               <int key="NSCellFlags2">71303168</int>
-                                                                                               <string key="NSContents">Detelecine:</string>
-                                                                                               <reference key="NSSupport" ref="26"/>
-                                                                                               <reference key="NSControlView" ref="57714806"/>
-                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                               <reference key="NSTextColor" ref="852384715"/>
-                                                                                       </object>
-                                                                               </object>
-                                                                               <object class="NSButton" id="407610327">
-                                                                                       <reference key="NSNextResponder" ref="628081139"/>
-                                                                                       <int key="NSvFlags">256</int>
-                                                                                       <string key="NSFrame">{{83, 249}, {18, 18}}</string>
-                                                                                       <reference key="NSSuperview" ref="628081139"/>
+                                                                       </object>
+                                                                       <string key="NSFrame">{{1, 1}, {230, 71}}</string>
+                                                                       <reference key="NSSuperview" ref="64221025"/>
+                                                               </object>
+                                                       </object>
+                                                       <string key="NSFrame">{{18, 253}, {232, 73}}</string>
+                                                       <reference key="NSSuperview" ref="49161063"/>
+                                                       <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="26"/>
+                                                               <reference key="NSBackgroundColor" ref="1045124059"/>
+                                                               <object class="NSColor" key="NSTextColor">
+                                                                       <int key="NSColorSpace">3</int>
+                                                                       <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+                                                               </object>
+                                                       </object>
+                                                       <reference key="NSContentView" ref="535027414"/>
+                                                       <int key="NSBorderType">1</int>
+                                                       <int key="NSBoxType">0</int>
+                                                       <int key="NSTitlePosition">0</int>
+                                                       <bool key="NSTransparent">NO</bool>
+                                               </object>
+                                               <object class="NSBox" id="1016849337">
+                                                       <reference key="NSNextResponder" ref="49161063"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <object class="NSMutableArray" key="NSSubviews">
+                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                               <object class="NSView" id="922899777">
+                                                                       <reference key="NSNextResponder" ref="1016849337"/>
+                                                                       <int key="NSvFlags">256</int>
+                                                                       <object class="NSMutableArray" key="NSSubviews">
+                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                               <object class="NSSlider" id="915194693">
+                                                                                       <reference key="NSNextResponder" ref="922899777"/>
+                                                                                       <int key="NSvFlags">268</int>
+                                                                                       <string key="NSFrame">{{59, 60}, {37, 16}}</string>
+                                                                                       <reference key="NSSuperview" ref="922899777"/>
                                                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -221,216 +355,467 @@
                                                                                                                <float key="blue">7.019608e-01</float>
                                                                                                                <float key="alpha">1.000000e+00</float>
                                                                                                        </object>
-                                                                                                       <reference key="CI_inputIntensity" ref="559925184"/>
+                                                                                                       <real value="1.000000e+00" key="CI_inputIntensity"/>
                                                                                                        <bool key="CIEnabled">YES</bool>
                                                                                                </object>
                                                                                        </object>
                                                                                        <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSButtonCell" key="NSCell" id="832714893">
+                                                                                       <object class="NSSliderCell" key="NSCell" id="220344376">
+                                                                                               <int key="NSCellFlags">-2079981824</int>
+                                                                                               <int key="NSCellFlags2">262144</int>
+                                                                                               <string key="NSContents"/>
+                                                                                               <reference key="NSSupport" ref="22"/>
+                                                                                               <reference key="NSControlView" ref="915194693"/>
+                                                                                               <double key="NSMaxValue">1.000000e+00</double>
+                                                                                               <double key="NSMinValue">0.000000e+00</double>
+                                                                                               <double key="NSValue">0.000000e+00</double>
+                                                                                               <double key="NSAltIncValue">0.000000e+00</double>
+                                                                                               <int key="NSNumberOfTickMarks">2</int>
+                                                                                               <int key="NSTickMarkPosition">1</int>
+                                                                                               <bool key="NSAllowsTickMarkValuesOnly">YES</bool>
+                                                                                               <bool key="NSVertical">NO</bool>
+                                                                                       </object>
+                                                                               </object>
+                                                                               <object class="NSTextField" id="1008481607">
+                                                                                       <reference key="NSNextResponder" ref="922899777"/>
+                                                                                       <int key="NSvFlags">268</int>
+                                                                                       <string key="NSFrame">{{1, 60}, {56, 17}}</string>
+                                                                                       <reference key="NSSuperview" ref="922899777"/>
+                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                       <object class="NSTextFieldCell" key="NSCell" id="32705166">
                                                                                                <int key="NSCellFlags">67239424</int>
-                                                                                               <int key="NSCellFlags2">67239936</int>
-                                                                                               <string key="NSContents">Detelecine:</string>
+                                                                                               <int key="NSCellFlags2">71303168</int>
+                                                                                               <string key="NSContents">Decomb</string>
                                                                                                <reference key="NSSupport" ref="26"/>
-                                                                                               <reference key="NSControlView" ref="407610327"/>
-                                                                                               <int key="NSButtonFlags">1210864127</int>
-                                                                                               <int key="NSButtonFlags2">2</int>
-                                                                                               <object class="NSButtonImageSource" key="NSAlternateImage" id="931738615">
-                                                                                                       <string key="NSImageName">NSSwitch</string>
-                                                                                               </object>
-                                                                                               <string key="NSAlternateContents"/>
-                                                                                               <string key="NSKeyEquivalent"/>
-                                                                                               <int key="NSPeriodicDelay">200</int>
-                                                                                               <int key="NSPeriodicInterval">25</int>
+                                                                                               <reference key="NSControlView" ref="1008481607"/>
+                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                               <reference key="NSTextColor" ref="852384715"/>
                                                                                        </object>
                                                                                </object>
-                                                                               <object class="NSButton" id="974850032">
-                                                                                       <reference key="NSNextResponder" ref="628081139"/>
-                                                                                       <int key="NSvFlags">256</int>
-                                                                                       <string key="NSFrame">{{80, 221}, {22, 18}}</string>
-                                                                                       <reference key="NSSuperview" ref="628081139"/>
-                                                                                       <bool key="NSViewIsLayerTreeHost">YES</bool>
-                                                                                       <object class="NSArray" key="NSViewContentFilters">
-                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                               <object class="CIColorMonochrome">
-                                                                                                       <object class="CIColor" key="CI_inputColor">
-                                                                                                               <float key="red">7.019608e-01</float>
-                                                                                                               <float key="green">7.019608e-01</float>
-                                                                                                               <float key="blue">7.019608e-01</float>
-                                                                                                               <float key="alpha">1.000000e+00</float>
-                                                                                                       </object>
-                                                                                                       <reference key="CI_inputIntensity" ref="559925184"/>
-                                                                                                       <bool key="CIEnabled">YES</bool>
-                                                                                               </object>
-                                                                                       </object>
+                                                                               <object class="NSTextField" id="915187908">
+                                                                                       <reference key="NSNextResponder" ref="922899777"/>
+                                                                                       <int key="NSvFlags">268</int>
+                                                                                       <string key="NSFrame">{{97, 59}, {89, 17}}</string>
+                                                                                       <reference key="NSSuperview" ref="922899777"/>
                                                                                        <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSButtonCell" key="NSCell" id="464410464">
+                                                                                       <object class="NSTextFieldCell" key="NSCell" id="801326190">
                                                                                                <int key="NSCellFlags">67239424</int>
-                                                                                               <int key="NSCellFlags2">67239936</int>
-                                                                                               <string key="NSContents">Decomb:</string>
+                                                                                               <int key="NSCellFlags2">4194304</int>
+                                                                                               <string key="NSContents">Deinterlace</string>
                                                                                                <reference key="NSSupport" ref="26"/>
-                                                                                               <reference key="NSControlView" ref="974850032"/>
-                                                                                               <int key="NSButtonFlags">1210864127</int>
-                                                                                               <int key="NSButtonFlags2">2</int>
-                                                                                               <reference key="NSAlternateImage" ref="931738615"/>
-                                                                                               <string key="NSAlternateContents"/>
-                                                                                               <string key="NSKeyEquivalent"/>
-                                                                                               <int key="NSPeriodicDelay">200</int>
-                                                                                               <int key="NSPeriodicInterval">25</int>
+                                                                                               <reference key="NSControlView" ref="915187908"/>
+                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                               <reference key="NSTextColor" ref="852384715"/>
                                                                                        </object>
                                                                                </object>
-                                                                               <object class="NSPopUpButton" id="243795165">
-                                                                                       <reference key="NSNextResponder" ref="628081139"/>
-                                                                                       <int key="NSvFlags">256</int>
-                                                                                       <string key="NSFrame">{{86, 166}, {109, 15}}</string>
-                                                                                       <reference key="NSSuperview" ref="628081139"/>
-                                                                                       <bool key="NSViewIsLayerTreeHost">YES</bool>
-                                                                                       <object class="NSArray" key="NSViewContentFilters">
+                                                                               <object class="NSBox" id="163128165">
+                                                                                       <reference key="NSNextResponder" ref="922899777"/>
+                                                                                       <int key="NSvFlags">18</int>
+                                                                                       <object class="NSMutableArray" key="NSSubviews">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                               <object class="CIColorMonochrome">
-                                                                                                       <object class="CIColor" key="CI_inputColor">
-                                                                                                               <float key="red">7.019608e-01</float>
-                                                                                                               <float key="green">7.019608e-01</float>
-                                                                                                               <float key="blue">7.019608e-01</float>
-                                                                                                               <float key="alpha">1.000000e+00</float>
+                                                                                               <object class="NSView" id="820974028">
+                                                                                                       <reference key="NSNextResponder" ref="163128165"/>
+                                                                                                       <int key="NSvFlags">256</int>
+                                                                                                       <object class="NSMutableArray" key="NSSubviews">
+                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                               <object class="NSTextField" id="212256262">
+                                                                                                                       <reference key="NSNextResponder" ref="820974028"/>
+                                                                                                                       <int key="NSvFlags">268</int>
+                                                                                                                       <string key="NSFrame">{{5, 33}, {68, 17}}</string>
+                                                                                                                       <reference key="NSSuperview" ref="820974028"/>
+                                                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                                                       <object class="NSTextFieldCell" key="NSCell" id="719157144">
+                                                                                                                               <int key="NSCellFlags">67239424</int>
+                                                                                                                               <int key="NSCellFlags2">71303168</int>
+                                                                                                                               <string key="NSContents">Decomb:</string>
+                                                                                                                               <reference key="NSSupport" ref="26"/>
+                                                                                                                               <reference key="NSControlView" ref="212256262"/>
+                                                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                               <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                       </object>
+                                                                                                               </object>
+                                                                                                               <object class="NSTextField" id="173366481">
+                                                                                                                       <reference key="NSNextResponder" ref="820974028"/>
+                                                                                                                       <int key="NSvFlags">268</int>
+                                                                                                                       <string key="NSFrame">{{5, 10}, {68, 17}}</string>
+                                                                                                                       <reference key="NSSuperview" ref="820974028"/>
+                                                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                                                       <object class="NSTextFieldCell" key="NSCell" id="554741989">
+                                                                                                                               <int key="NSCellFlags">67239424</int>
+                                                                                                                               <int key="NSCellFlags2">71303168</int>
+                                                                                                                               <string key="NSContents">Custom:</string>
+                                                                                                                               <reference key="NSSupport" ref="26"/>
+                                                                                                                               <reference key="NSControlView" ref="173366481"/>
+                                                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                               <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                       </object>
+                                                                                                               </object>
+                                                                                                               <object class="NSPopUpButton" id="267145969">
+                                                                                                                       <reference key="NSNextResponder" ref="820974028"/>
+                                                                                                                       <int key="NSvFlags">268</int>
+                                                                                                                       <string key="NSFrame">{{93, 34}, {110, 15}}</string>
+                                                                                                                       <reference key="NSSuperview" ref="820974028"/>
+                                                                                                                       <bool key="NSViewIsLayerTreeHost">YES</bool>
+                                                                                                                       <object class="NSArray" key="NSViewContentFilters">
+                                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                               <object class="CIColorMonochrome">
+                                                                                                                                       <object class="CIColor" key="CI_inputColor">
+                                                                                                                                               <float key="red">7.019608e-01</float>
+                                                                                                                                               <float key="green">7.019608e-01</float>
+                                                                                                                                               <float key="blue">7.019608e-01</float>
+                                                                                                                                               <float key="alpha">1.000000e+00</float>
+                                                                                                                                       </object>
+                                                                                                                                       <real value="1.000000e+00" key="CI_inputIntensity" id="463946280"/>
+                                                                                                                                       <bool key="CIEnabled">YES</bool>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                                                       <object class="NSPopUpButtonCell" key="NSCell" id="522037822">
+                                                                                                                               <int key="NSCellFlags">-2076049856</int>
+                                                                                                                               <int key="NSCellFlags2">264192</int>
+                                                                                                                               <reference key="NSSupport" ref="22"/>
+                                                                                                                               <reference key="NSControlView" ref="267145969"/>
+                                                                                                                               <int key="NSButtonFlags">109199615</int>
+                                                                                                                               <int key="NSButtonFlags2">1</int>
+                                                                                                                               <reference key="NSAlternateImage" ref="826709342"/>
+                                                                                                                               <string key="NSAlternateContents"/>
+                                                                                                                               <object class="NSMutableString" key="NSKeyEquivalent">
+                                                                                                                                       <characters key="NS.bytes"/>
+                                                                                                                               </object>
+                                                                                                                               <int key="NSPeriodicDelay">400</int>
+                                                                                                                               <int key="NSPeriodicInterval">75</int>
+                                                                                                                               <object class="NSMenuItem" key="NSMenuItem" id="765424858">
+                                                                                                                                       <reference key="NSMenu" ref="498815766"/>
+                                                                                                                                       <string key="NSTitle">Item1</string>
+                                                                                                                                       <string key="NSKeyEquiv"/>
+                                                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                                       <int key="NSState">1</int>
+                                                                                                                                       <reference key="NSOnImage" ref="230561202"/>
+                                                                                                                                       <reference key="NSMixedImage" ref="887538330"/>
+                                                                                                                                       <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                       <reference key="NSTarget" ref="522037822"/>
+                                                                                                                               </object>
+                                                                                                                               <bool key="NSMenuItemRespectAlignment">YES</bool>
+                                                                                                                               <object class="NSMenu" key="NSMenu" id="498815766">
+                                                                                                                                       <object class="NSMutableString" key="NSTitle">
+                                                                                                                                               <characters key="NS.bytes">OtherViews</characters>
+                                                                                                                                       </object>
+                                                                                                                                       <object class="NSMutableArray" key="NSMenuItems">
+                                                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                                               <reference ref="765424858"/>
+                                                                                                                                               <object class="NSMenuItem" id="941926270">
+                                                                                                                                                       <reference key="NSMenu" ref="498815766"/>
+                                                                                                                                                       <string key="NSTitle">Item2</string>
+                                                                                                                                                       <string key="NSKeyEquiv"/>
+                                                                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                                                       <reference key="NSOnImage" ref="230561202"/>
+                                                                                                                                                       <reference key="NSMixedImage" ref="887538330"/>
+                                                                                                                                                       <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                                       <reference key="NSTarget" ref="522037822"/>
+                                                                                                                                               </object>
+                                                                                                                                               <object class="NSMenuItem" id="679002198">
+                                                                                                                                                       <reference key="NSMenu" ref="498815766"/>
+                                                                                                                                                       <string key="NSTitle">Item3</string>
+                                                                                                                                                       <string key="NSKeyEquiv"/>
+                                                                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                                                       <reference key="NSOnImage" ref="230561202"/>
+                                                                                                                                                       <reference key="NSMixedImage" ref="887538330"/>
+                                                                                                                                                       <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                                       <reference key="NSTarget" ref="522037822"/>
+                                                                                                                                               </object>
+                                                                                                                                       </object>
+                                                                                                                               </object>
+                                                                                                                               <int key="NSPreferredEdge">3</int>
+                                                                                                                               <bool key="NSUsesItemFromMenu">YES</bool>
+                                                                                                                               <bool key="NSAltersState">YES</bool>
+                                                                                                                               <int key="NSArrowPosition">1</int>
+                                                                                                                       </object>
+                                                                                                               </object>
+                                                                                                               <object class="NSTextField" id="1033588876">
+                                                                                                                       <reference key="NSNextResponder" ref="820974028"/>
+                                                                                                                       <int key="NSvFlags">268</int>
+                                                                                                                       <string key="NSFrame">{{94, 12}, {108, 16}}</string>
+                                                                                                                       <reference key="NSSuperview" ref="820974028"/>
+                                                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                                                       <object class="NSTextFieldCell" key="NSCell" id="493007225">
+                                                                                                                               <int key="NSCellFlags">-1804468671</int>
+                                                                                                                               <int key="NSCellFlags2">272892928</int>
+                                                                                                                               <string key="NSContents"/>
+                                                                                                                               <reference key="NSSupport" ref="22"/>
+                                                                                                                               <reference key="NSControlView" ref="1033588876"/>
+                                                                                                                               <bool key="NSDrawsBackground">YES</bool>
+                                                                                                                               <reference key="NSBackgroundColor" ref="1045124059"/>
+                                                                                                                               <reference key="NSTextColor" ref="387185281"/>
+                                                                                                                       </object>
+                                                                                                               </object>
                                                                                                        </object>
-                                                                                                       <reference key="CI_inputIntensity" ref="559925184"/>
-                                                                                                       <bool key="CIEnabled">YES</bool>
+                                                                                                       <string key="NSFrameSize">{215, 60}</string>
+                                                                                                       <reference key="NSSuperview" ref="163128165"/>
                                                                                                </object>
                                                                                        </object>
-                                                                                       <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSPopUpButtonCell" key="NSCell" id="708528272">
-                                                                                               <int key="NSCellFlags">-2076049856</int>
-                                                                                               <int key="NSCellFlags2">264192</int>
-                                                                                               <reference key="NSSupport" ref="22"/>
-                                                                                               <reference key="NSControlView" ref="243795165"/>
-                                                                                               <int key="NSButtonFlags">109199615</int>
-                                                                                               <int key="NSButtonFlags2">1</int>
-                                                                                               <reference key="NSAlternateImage" ref="826709342"/>
-                                                                                               <string key="NSAlternateContents"/>
-                                                                                               <object class="NSMutableString" key="NSKeyEquivalent">
-                                                                                                       <characters key="NS.bytes"/>
-                                                                                               </object>
-                                                                                               <int key="NSPeriodicDelay">400</int>
-                                                                                               <int key="NSPeriodicInterval">75</int>
-                                                                                               <object class="NSMenuItem" key="NSMenuItem" id="114494573">
-                                                                                                       <reference key="NSMenu" ref="176321383"/>
-                                                                                                       <string key="NSTitle">Item1</string>
-                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
-                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                       <int key="NSState">1</int>
-                                                                                                       <reference key="NSOnImage" ref="39717236"/>
-                                                                                                       <reference key="NSMixedImage" ref="1010805506"/>
-                                                                                                       <string key="NSAction">_popUpItemAction:</string>
-                                                                                                       <reference key="NSTarget" ref="708528272"/>
+                                                                                       <string key="NSFrame">{{5, -7}, {215, 60}}</string>
+                                                                                       <reference key="NSSuperview" ref="922899777"/>
+                                                                                       <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="26"/>
+                                                                                               <reference key="NSBackgroundColor" ref="1045124059"/>
+                                                                                               <object class="NSColor" key="NSTextColor">
+                                                                                                       <int key="NSColorSpace">3</int>
+                                                                                                       <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
                                                                                                </object>
-                                                                                               <bool key="NSMenuItemRespectAlignment">YES</bool>
-                                                                                               <object class="NSMenu" key="NSMenu" id="176321383">
-                                                                                                       <object class="NSMutableString" key="NSTitle">
-                                                                                                               <characters key="NS.bytes">OtherViews</characters>
-                                                                                                       </object>
-                                                                                                       <object class="NSMutableArray" key="NSMenuItems">
+                                                                                       </object>
+                                                                                       <reference key="NSContentView" ref="820974028"/>
+                                                                                       <int key="NSBorderType">0</int>
+                                                                                       <int key="NSBoxType">4</int>
+                                                                                       <int key="NSTitlePosition">0</int>
+                                                                                       <bool key="NSTransparent">NO</bool>
+                                                                               </object>
+                                                                               <object class="NSBox" id="330241286">
+                                                                                       <reference key="NSNextResponder" ref="922899777"/>
+                                                                                       <int key="NSvFlags">18</int>
+                                                                                       <object class="NSMutableArray" key="NSSubviews">
+                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                               <object class="NSView" id="734624028">
+                                                                                                       <reference key="NSNextResponder" ref="330241286"/>
+                                                                                                       <int key="NSvFlags">256</int>
+                                                                                                       <object class="NSMutableArray" key="NSSubviews">
                                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                               <reference ref="114494573"/>
-                                                                                                               <object class="NSMenuItem" id="750998660">
-                                                                                                                       <reference key="NSMenu" ref="176321383"/>
-                                                                                                                       <string key="NSTitle">Item2</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="39717236"/>
-                                                                                                                       <reference key="NSMixedImage" ref="1010805506"/>
-                                                                                                                       <string key="NSAction">_popUpItemAction:</string>
-                                                                                                                       <reference key="NSTarget" ref="708528272"/>
+                                                                                                               <object class="NSTextField" id="241774821">
+                                                                                                                       <reference key="NSNextResponder" ref="734624028"/>
+                                                                                                                       <int key="NSvFlags">268</int>
+                                                                                                                       <string key="NSFrame">{{8, 33}, {68, 17}}</string>
+                                                                                                                       <reference key="NSSuperview" ref="734624028"/>
+                                                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                                                       <object class="NSTextFieldCell" key="NSCell" id="823247511">
+                                                                                                                               <int key="NSCellFlags">67239424</int>
+                                                                                                                               <int key="NSCellFlags2">71303168</int>
+                                                                                                                               <string key="NSContents">Deinterlace:</string>
+                                                                                                                               <reference key="NSSupport" ref="26"/>
+                                                                                                                               <reference key="NSControlView" ref="241774821"/>
+                                                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                               <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                       </object>
                                                                                                                </object>
-                                                                                                               <object class="NSMenuItem" id="133285043">
-                                                                                                                       <reference key="NSMenu" ref="176321383"/>
-                                                                                                                       <string key="NSTitle">Item3</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="39717236"/>
-                                                                                                                       <reference key="NSMixedImage" ref="1010805506"/>
-                                                                                                                       <string key="NSAction">_popUpItemAction:</string>
-                                                                                                                       <reference key="NSTarget" ref="708528272"/>
+                                                                                                               <object class="NSTextField" id="321610274">
+                                                                                                                       <reference key="NSNextResponder" ref="734624028"/>
+                                                                                                                       <int key="NSvFlags">268</int>
+                                                                                                                       <string key="NSFrame">{{8, 10}, {68, 17}}</string>
+                                                                                                                       <reference key="NSSuperview" ref="734624028"/>
+                                                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                                                       <object class="NSTextFieldCell" key="NSCell" id="339882403">
+                                                                                                                               <int key="NSCellFlags">67239424</int>
+                                                                                                                               <int key="NSCellFlags2">71303168</int>
+                                                                                                                               <string key="NSContents">Custom:</string>
+                                                                                                                               <reference key="NSSupport" ref="26"/>
+                                                                                                                               <reference key="NSControlView" ref="321610274"/>
+                                                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                               <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                       </object>
+                                                                                                               </object>
+                                                                                                               <object class="NSPopUpButton" id="254048379">
+                                                                                                                       <reference key="NSNextResponder" ref="734624028"/>
+                                                                                                                       <int key="NSvFlags">268</int>
+                                                                                                                       <string key="NSFrame">{{96, 34}, {110, 15}}</string>
+                                                                                                                       <reference key="NSSuperview" ref="734624028"/>
+                                                                                                                       <bool key="NSViewIsLayerTreeHost">YES</bool>
+                                                                                                                       <object class="NSArray" key="NSViewContentFilters">
+                                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                               <object class="CIColorMonochrome">
+                                                                                                                                       <object class="CIColor" key="CI_inputColor">
+                                                                                                                                               <float key="red">7.019608e-01</float>
+                                                                                                                                               <float key="green">7.019608e-01</float>
+                                                                                                                                               <float key="blue">7.019608e-01</float>
+                                                                                                                                               <float key="alpha">1.000000e+00</float>
+                                                                                                                                       </object>
+                                                                                                                                       <real value="1.000000e+00" key="CI_inputIntensity" id="917308943"/>
+                                                                                                                                       <bool key="CIEnabled">YES</bool>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                                                       <object class="NSPopUpButtonCell" key="NSCell" id="856636688">
+                                                                                                                               <int key="NSCellFlags">-2076049856</int>
+                                                                                                                               <int key="NSCellFlags2">264192</int>
+                                                                                                                               <reference key="NSSupport" ref="22"/>
+                                                                                                                               <reference key="NSControlView" ref="254048379"/>
+                                                                                                                               <int key="NSButtonFlags">109199615</int>
+                                                                                                                               <int key="NSButtonFlags2">1</int>
+                                                                                                                               <reference key="NSAlternateImage" ref="826709342"/>
+                                                                                                                               <string key="NSAlternateContents"/>
+                                                                                                                               <object class="NSMutableString" key="NSKeyEquivalent">
+                                                                                                                                       <characters key="NS.bytes"/>
+                                                                                                                               </object>
+                                                                                                                               <int key="NSPeriodicDelay">400</int>
+                                                                                                                               <int key="NSPeriodicInterval">75</int>
+                                                                                                                               <object class="NSMenuItem" key="NSMenuItem" id="466450876">
+                                                                                                                                       <reference key="NSMenu" ref="305994847"/>
+                                                                                                                                       <string key="NSTitle">Item1</string>
+                                                                                                                                       <string key="NSKeyEquiv"/>
+                                                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                                       <int key="NSState">1</int>
+                                                                                                                                       <reference key="NSOnImage" ref="230561202"/>
+                                                                                                                                       <reference key="NSMixedImage" ref="887538330"/>
+                                                                                                                                       <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                       <reference key="NSTarget" ref="856636688"/>
+                                                                                                                               </object>
+                                                                                                                               <bool key="NSMenuItemRespectAlignment">YES</bool>
+                                                                                                                               <object class="NSMenu" key="NSMenu" id="305994847">
+                                                                                                                                       <object class="NSMutableString" key="NSTitle">
+                                                                                                                                               <characters key="NS.bytes">OtherViews</characters>
+                                                                                                                                       </object>
+                                                                                                                                       <object class="NSMutableArray" key="NSMenuItems">
+                                                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                                               <reference ref="466450876"/>
+                                                                                                                                               <object class="NSMenuItem" id="593929782">
+                                                                                                                                                       <reference key="NSMenu" ref="305994847"/>
+                                                                                                                                                       <string key="NSTitle">Item2</string>
+                                                                                                                                                       <string key="NSKeyEquiv"/>
+                                                                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                                                       <reference key="NSOnImage" ref="230561202"/>
+                                                                                                                                                       <reference key="NSMixedImage" ref="887538330"/>
+                                                                                                                                                       <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                                       <reference key="NSTarget" ref="856636688"/>
+                                                                                                                                               </object>
+                                                                                                                                               <object class="NSMenuItem" id="71113963">
+                                                                                                                                                       <reference key="NSMenu" ref="305994847"/>
+                                                                                                                                                       <string key="NSTitle">Item3</string>
+                                                                                                                                                       <string key="NSKeyEquiv"/>
+                                                                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                                                       <reference key="NSOnImage" ref="230561202"/>
+                                                                                                                                                       <reference key="NSMixedImage" ref="887538330"/>
+                                                                                                                                                       <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                                       <reference key="NSTarget" ref="856636688"/>
+                                                                                                                                               </object>
+                                                                                                                                       </object>
+                                                                                                                               </object>
+                                                                                                                               <int key="NSPreferredEdge">3</int>
+                                                                                                                               <bool key="NSUsesItemFromMenu">YES</bool>
+                                                                                                                               <bool key="NSAltersState">YES</bool>
+                                                                                                                               <int key="NSArrowPosition">1</int>
+                                                                                                                       </object>
+                                                                                                               </object>
+                                                                                                               <object class="NSTextField" id="431580657">
+                                                                                                                       <reference key="NSNextResponder" ref="734624028"/>
+                                                                                                                       <int key="NSvFlags">268</int>
+                                                                                                                       <string key="NSFrame">{{97, 12}, {108, 16}}</string>
+                                                                                                                       <reference key="NSSuperview" ref="734624028"/>
+                                                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                                                       <object class="NSTextFieldCell" key="NSCell" id="109957268">
+                                                                                                                               <int key="NSCellFlags">-1804468671</int>
+                                                                                                                               <int key="NSCellFlags2">272892928</int>
+                                                                                                                               <string key="NSContents"/>
+                                                                                                                               <reference key="NSSupport" ref="22"/>
+                                                                                                                               <reference key="NSControlView" ref="431580657"/>
+                                                                                                                               <bool key="NSDrawsBackground">YES</bool>
+                                                                                                                               <reference key="NSBackgroundColor" ref="1045124059"/>
+                                                                                                                               <reference key="NSTextColor" ref="387185281"/>
+                                                                                                                       </object>
                                                                                                                </object>
                                                                                                        </object>
+                                                                                                       <string key="NSFrameSize">{221, 60}</string>
+                                                                                                       <reference key="NSSuperview" ref="330241286"/>
                                                                                                </object>
-                                                                                               <int key="NSPreferredEdge">3</int>
-                                                                                               <bool key="NSUsesItemFromMenu">YES</bool>
-                                                                                               <bool key="NSAltersState">YES</bool>
-                                                                                               <int key="NSArrowPosition">1</int>
                                                                                        </object>
-                                                                               </object>
-                                                                               <object class="NSTextField" id="94419441">
-                                                                                       <reference key="NSNextResponder" ref="628081139"/>
-                                                                                       <int key="NSvFlags">256</int>
-                                                                                       <string key="NSFrame">{{31, 165}, {51, 17}}</string>
-                                                                                       <reference key="NSSuperview" ref="628081139"/>
-                                                                                       <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSTextFieldCell" key="NSCell" id="741873280">
+                                                                                       <string key="NSFrame">{{2, -7}, {221, 60}}</string>
+                                                                                       <reference key="NSSuperview" ref="922899777"/>
+                                                                                       <string key="NSOffsets">{0, 0}</string>
+                                                                                       <object class="NSTextFieldCell" key="NSTitleCell">
                                                                                                <int key="NSCellFlags">67239424</int>
-                                                                                               <int key="NSCellFlags2">71303168</int>
-                                                                                               <string key="NSContents">Denoise:</string>
+                                                                                               <int key="NSCellFlags2">0</int>
+                                                                                               <string key="NSContents">Box</string>
                                                                                                <reference key="NSSupport" ref="26"/>
-                                                                                               <reference key="NSControlView" ref="94419441"/>
-                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                               <reference key="NSTextColor" ref="852384715"/>
+                                                                                               <reference key="NSBackgroundColor" ref="1045124059"/>
+                                                                                               <object class="NSColor" key="NSTextColor">
+                                                                                                       <int key="NSColorSpace">3</int>
+                                                                                                       <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+                                                                                               </object>
                                                                                        </object>
+                                                                                       <reference key="NSContentView" ref="734624028"/>
+                                                                                       <int key="NSBorderType">0</int>
+                                                                                       <int key="NSBoxType">0</int>
+                                                                                       <int key="NSTitlePosition">0</int>
+                                                                                       <bool key="NSTransparent">NO</bool>
                                                                                </object>
-                                                                               <object class="NSTextField" id="1069536323">
-                                                                                       <reference key="NSNextResponder" ref="628081139"/>
-                                                                                       <int key="NSvFlags">256</int>
-                                                                                       <string key="NSFrame">{{30, 138}, {51, 17}}</string>
-                                                                                       <reference key="NSSuperview" ref="628081139"/>
+                                                                       </object>
+                                                                       <string key="NSFrame">{{2, 18}, {228, 88}}</string>
+                                                                       <reference key="NSSuperview" ref="1016849337"/>
+                                                               </object>
+                                                       </object>
+                                                       <string key="NSFrame">{{18, 164}, {232, 108}}</string>
+                                                       <reference key="NSSuperview" ref="49161063"/>
+                                                       <string key="NSOffsets">{0, 0}</string>
+                                                       <object class="NSTextFieldCell" key="NSTitleCell">
+                                                               <int key="NSCellFlags">67239424</int>
+                                                               <int key="NSCellFlags2">0</int>
+                                                               <string key="NSContents"/>
+                                                               <reference key="NSSupport" ref="26"/>
+                                                               <reference key="NSBackgroundColor" ref="1045124059"/>
+                                                               <object class="NSColor" key="NSTextColor">
+                                                                       <int key="NSColorSpace">3</int>
+                                                                       <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+                                                               </object>
+                                                       </object>
+                                                       <reference key="NSContentView" ref="922899777"/>
+                                                       <int key="NSBorderType">3</int>
+                                                       <int key="NSBoxType">0</int>
+                                                       <int key="NSTitlePosition">4</int>
+                                                       <bool key="NSTransparent">NO</bool>
+                                               </object>
+                                               <object class="NSBox" id="726562036">
+                                                       <reference key="NSNextResponder" ref="49161063"/>
+                                                       <int key="NSvFlags">18</int>
+                                                       <object class="NSMutableArray" key="NSSubviews">
+                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                               <object class="NSView" id="21570386">
+                                                                       <reference key="NSNextResponder" ref="726562036"/>
+                                                                       <int key="NSvFlags">256</int>
+                                                                       <object class="NSMutableArray" key="NSSubviews">
+                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                               <object class="NSTextField" id="548934652">
+                                                                                       <reference key="NSNextResponder" ref="21570386"/>
+                                                                                       <int key="NSvFlags">268</int>
+                                                                                       <string key="NSFrame">{{15, 45}, {68, 17}}</string>
+                                                                                       <reference key="NSSuperview" ref="21570386"/>
                                                                                        <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSTextFieldCell" key="NSCell" id="728722104">
+                                                                                       <object class="NSTextFieldCell" key="NSCell" id="1060377661">
                                                                                                <int key="NSCellFlags">67239424</int>
                                                                                                <int key="NSCellFlags2">71303168</int>
-                                                                                               <string key="NSContents">Deblock:</string>
+                                                                                               <string key="NSContents">Denoise:</string>
                                                                                                <reference key="NSSupport" ref="26"/>
-                                                                                               <reference key="NSControlView" ref="1069536323"/>
+                                                                                               <reference key="NSControlView" ref="548934652"/>
                                                                                                <reference key="NSBackgroundColor" ref="407686733"/>
                                                                                                <reference key="NSTextColor" ref="852384715"/>
                                                                                        </object>
                                                                                </object>
-                                                                               <object class="NSTextField" id="762149330">
-                                                                                       <reference key="NSNextResponder" ref="628081139"/>
-                                                                                       <int key="NSvFlags">256</int>
-                                                                                       <string key="NSFrame">{{26, 223}, {55, 14}}</string>
-                                                                                       <reference key="NSSuperview" ref="628081139"/>
+                                                                               <object class="NSTextField" id="957122238">
+                                                                                       <reference key="NSNextResponder" ref="21570386"/>
+                                                                                       <int key="NSvFlags">268</int>
+                                                                                       <string key="NSFrame">{{15, 22}, {68, 17}}</string>
+                                                                                       <reference key="NSSuperview" ref="21570386"/>
                                                                                        <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSTextFieldCell" key="NSCell" id="192583280">
+                                                                                       <object class="NSTextFieldCell" key="NSCell" id="927749651">
                                                                                                <int key="NSCellFlags">67239424</int>
                                                                                                <int key="NSCellFlags2">71303168</int>
-                                                                                               <string key="NSContents">Decomb:</string>
+                                                                                               <string key="NSContents">Custom:</string>
                                                                                                <reference key="NSSupport" ref="26"/>
-                                                                                               <reference key="NSControlView" ref="762149330"/>
+                                                                                               <reference key="NSControlView" ref="957122238"/>
                                                                                                <reference key="NSBackgroundColor" ref="407686733"/>
                                                                                                <reference key="NSTextColor" ref="852384715"/>
                                                                                        </object>
                                                                                </object>
-                                                                               <object class="NSTextField" id="314638156">
-                                                                                       <reference key="NSNextResponder" ref="628081139"/>
-                                                                                       <int key="NSvFlags">256</int>
-                                                                                       <string key="NSFrame">{{80, 140}, {31, 14}}</string>
-                                                                                       <reference key="NSSuperview" ref="628081139"/>
-                                                                                       <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSTextFieldCell" key="NSCell" id="350598908">
-                                                                                               <int key="NSCellFlags">67239424</int>
-                                                                                               <int key="NSCellFlags2">138543104</int>
-                                                                                               <string key="NSContents">Off</string>
-                                                                                               <reference key="NSSupport" ref="26"/>
-                                                                                               <reference key="NSControlView" ref="314638156"/>
-                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                               <reference key="NSTextColor" ref="852384715"/>
-                                                                                       </object>
-                                                                               </object>
-                                                                               <object class="NSSlider" id="581126685">
-                                                                                       <reference key="NSNextResponder" ref="628081139"/>
+                                                                               <object class="NSPopUpButton" id="909105719">
+                                                                                       <reference key="NSNextResponder" ref="21570386"/>
                                                                                        <int key="NSvFlags">268</int>
-                                                                                       <string key="NSFrame">{{118, 138}, {96, 16}}</string>
-                                                                                       <reference key="NSSuperview" ref="628081139"/>
+                                                                                       <string key="NSFrame">{{103, 46}, {110, 15}}</string>
+                                                                                       <reference key="NSSuperview" ref="21570386"/>
                                                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -441,64 +826,169 @@
                                                                                                                <float key="blue">7.019608e-01</float>
                                                                                                                <float key="alpha">1.000000e+00</float>
                                                                                                        </object>
-                                                                                                       <reference key="CI_inputIntensity" ref="559925184"/>
+                                                                                                       <real value="1.000000e+00" key="CI_inputIntensity" id="640207679"/>
                                                                                                        <bool key="CIEnabled">YES</bool>
                                                                                                </object>
                                                                                        </object>
                                                                                        <bool key="NSEnabled">YES</bool>
-                                                                                       <object class="NSSliderCell" key="NSCell" id="257047106">
-                                                                                               <int key="NSCellFlags">-2079981824</int>
-                                                                                               <int key="NSCellFlags2">262144</int>
+                                                                                       <object class="NSPopUpButtonCell" key="NSCell" id="928502475">
+                                                                                               <int key="NSCellFlags">-2076049856</int>
+                                                                                               <int key="NSCellFlags2">264192</int>
+                                                                                               <reference key="NSSupport" ref="22"/>
+                                                                                               <reference key="NSControlView" ref="909105719"/>
+                                                                                               <int key="NSButtonFlags">109199615</int>
+                                                                                               <int key="NSButtonFlags2">1</int>
+                                                                                               <reference key="NSAlternateImage" ref="826709342"/>
+                                                                                               <string key="NSAlternateContents"/>
+                                                                                               <object class="NSMutableString" key="NSKeyEquivalent">
+                                                                                                       <characters key="NS.bytes"/>
+                                                                                               </object>
+                                                                                               <int key="NSPeriodicDelay">400</int>
+                                                                                               <int key="NSPeriodicInterval">75</int>
+                                                                                               <object class="NSMenuItem" key="NSMenuItem" id="852213231">
+                                                                                                       <reference key="NSMenu" ref="317487076"/>
+                                                                                                       <string key="NSTitle">Item1</string>
+                                                                                                       <string key="NSKeyEquiv"/>
+                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                       <int key="NSState">1</int>
+                                                                                                       <reference key="NSOnImage" ref="230561202"/>
+                                                                                                       <reference key="NSMixedImage" ref="887538330"/>
+                                                                                                       <string key="NSAction">_popUpItemAction:</string>
+                                                                                                       <reference key="NSTarget" ref="928502475"/>
+                                                                                               </object>
+                                                                                               <bool key="NSMenuItemRespectAlignment">YES</bool>
+                                                                                               <object class="NSMenu" key="NSMenu" id="317487076">
+                                                                                                       <object class="NSMutableString" key="NSTitle">
+                                                                                                               <characters key="NS.bytes">OtherViews</characters>
+                                                                                                       </object>
+                                                                                                       <object class="NSMutableArray" key="NSMenuItems">
+                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                               <reference ref="852213231"/>
+                                                                                                               <object class="NSMenuItem" id="847528775">
+                                                                                                                       <reference key="NSMenu" ref="317487076"/>
+                                                                                                                       <string key="NSTitle">Item2</string>
+                                                                                                                       <string key="NSKeyEquiv"/>
+                                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                       <reference key="NSOnImage" ref="230561202"/>
+                                                                                                                       <reference key="NSMixedImage" ref="887538330"/>
+                                                                                                                       <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                       <reference key="NSTarget" ref="928502475"/>
+                                                                                                               </object>
+                                                                                                               <object class="NSMenuItem" id="580567864">
+                                                                                                                       <reference key="NSMenu" ref="317487076"/>
+                                                                                                                       <string key="NSTitle">Item3</string>
+                                                                                                                       <string key="NSKeyEquiv"/>
+                                                                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                       <reference key="NSOnImage" ref="230561202"/>
+                                                                                                                       <reference key="NSMixedImage" ref="887538330"/>
+                                                                                                                       <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                       <reference key="NSTarget" ref="928502475"/>
+                                                                                                               </object>
+                                                                                                       </object>
+                                                                                               </object>
+                                                                                               <int key="NSPreferredEdge">3</int>
+                                                                                               <bool key="NSUsesItemFromMenu">YES</bool>
+                                                                                               <bool key="NSAltersState">YES</bool>
+                                                                                               <int key="NSArrowPosition">1</int>
+                                                                                       </object>
+                                                                               </object>
+                                                                               <object class="NSTextField" id="166645029">
+                                                                                       <reference key="NSNextResponder" ref="21570386"/>
+                                                                                       <int key="NSvFlags">268</int>
+                                                                                       <string key="NSFrame">{{104, 24}, {108, 16}}</string>
+                                                                                       <reference key="NSSuperview" ref="21570386"/>
+                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                       <object class="NSTextFieldCell" key="NSCell" id="415949117">
+                                                                                               <int key="NSCellFlags">-1804468671</int>
+                                                                                               <int key="NSCellFlags2">272892928</int>
                                                                                                <string key="NSContents"/>
                                                                                                <reference key="NSSupport" ref="22"/>
-                                                                                               <reference key="NSControlView" ref="581126685"/>
-                                                                                               <double key="NSMaxValue">1.500000e+01</double>
-                                                                                               <double key="NSMinValue">4.000000e+00</double>
-                                                                                               <double key="NSValue">4.000000e+00</double>
-                                                                                               <double key="NSAltIncValue">0.000000e+00</double>
-                                                                                               <int key="NSNumberOfTickMarks">12</int>
-                                                                                               <int key="NSTickMarkPosition">0</int>
-                                                                                               <bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-                                                                                               <bool key="NSVertical">NO</bool>
+                                                                                               <reference key="NSControlView" ref="166645029"/>
+                                                                                               <bool key="NSDrawsBackground">YES</bool>
+                                                                                               <reference key="NSBackgroundColor" ref="1045124059"/>
+                                                                                               <reference key="NSTextColor" ref="387185281"/>
                                                                                        </object>
                                                                                </object>
                                                                        </object>
-                                                                       <string key="NSFrame">{{2, 18}, {228, 283}}</string>
-                                                                       <reference key="NSSuperview" ref="309105014"/>
+                                                                       <string key="NSFrame">{{1, 1}, {230, 71}}</string>
+                                                                       <reference key="NSSuperview" ref="726562036"/>
                                                                </object>
                                                        </object>
-                                                       <string key="NSFrame">{{17, 22}, {232, 303}}</string>
+                                                       <string key="NSFrame">{{17, 98}, {232, 73}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <string key="NSOffsets">{0, 0}</string>
                                                        <object class="NSTextFieldCell" key="NSTitleCell">
                                                                <int key="NSCellFlags">67239424</int>
                                                                <int key="NSCellFlags2">0</int>
-                                                               <string key="NSContents"/>
+                                                               <string key="NSContents">Box</string>
                                                                <reference key="NSSupport" ref="26"/>
-                                                               <object class="NSColor" key="NSBackgroundColor">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">textBackgroundColor</string>
-                                                                       <object class="NSColor" key="NSColor">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MQA</bytes>
-                                                                       </object>
-                                                               </object>
+                                                               <reference key="NSBackgroundColor" ref="1045124059"/>
                                                                <object class="NSColor" key="NSTextColor">
                                                                        <int key="NSColorSpace">3</int>
                                                                        <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
                                                                </object>
                                                        </object>
-                                                       <reference key="NSContentView" ref="628081139"/>
-                                                       <int key="NSBorderType">3</int>
+                                                       <reference key="NSContentView" ref="21570386"/>
+                                                       <int key="NSBorderType">1</int>
                                                        <int key="NSBoxType">0</int>
-                                                       <int key="NSTitlePosition">4</int>
+                                                       <int key="NSTitlePosition">0</int>
                                                        <bool key="NSTransparent">NO</bool>
                                                </object>
-                                               <object class="NSButton" id="892118626">
+                                               <object class="NSTextField" id="1069536323">
                                                        <reference key="NSNextResponder" ref="49161063"/>
-                                                       <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{19, 345}, {57, 16}}</string>
+                                                       <int key="NSvFlags">256</int>
+                                                       <string key="NSFrame">{{51, 74}, {51, 17}}</string>
+                                                       <reference key="NSSuperview" ref="49161063"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="728722104">
+                                                               <int key="NSCellFlags">67239424</int>
+                                                               <int key="NSCellFlags2">71303168</int>
+                                                               <string key="NSContents">Deblock:</string>
+                                                               <reference key="NSSupport" ref="26"/>
+                                                               <reference key="NSControlView" ref="1069536323"/>
+                                                               <reference key="NSBackgroundColor" ref="407686733"/>
+                                                               <reference key="NSTextColor" ref="852384715"/>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="225452500">
+                                                       <reference key="NSNextResponder" ref="49161063"/>
+                                                       <int key="NSvFlags">256</int>
+                                                       <string key="NSFrame">{{39, 47}, {63, 14}}</string>
+                                                       <reference key="NSSuperview" ref="49161063"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="27390208">
+                                                               <int key="NSCellFlags">67239424</int>
+                                                               <int key="NSCellFlags2">71303168</int>
+                                                               <string key="NSContents">Grayscale:</string>
+                                                               <reference key="NSSupport" ref="26"/>
+                                                               <reference key="NSControlView" ref="225452500"/>
+                                                               <reference key="NSBackgroundColor" ref="407686733"/>
+                                                               <reference key="NSTextColor" ref="852384715"/>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="314638156">
+                                                       <reference key="NSNextResponder" ref="49161063"/>
+                                                       <int key="NSvFlags">256</int>
+                                                       <string key="NSFrame">{{101, 76}, {31, 14}}</string>
+                                                       <reference key="NSSuperview" ref="49161063"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="350598908">
+                                                               <int key="NSCellFlags">67239424</int>
+                                                               <int key="NSCellFlags2">138543104</int>
+                                                               <string key="NSContents">Off</string>
+                                                               <reference key="NSSupport" ref="26"/>
+                                                               <reference key="NSControlView" ref="314638156"/>
+                                                               <reference key="NSBackgroundColor" ref="407686733"/>
+                                                               <reference key="NSTextColor" ref="852384715"/>
+                                                       </object>
+                                               </object>
+                                               <object class="NSSlider" id="581126685">
+                                                       <reference key="NSNextResponder" ref="49161063"/>
+                                                       <int key="NSvFlags">256</int>
+                                                       <string key="NSFrame">{{137, 76}, {96, 16}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                        <object class="NSArray" key="NSViewContentFilters">
@@ -515,24 +1005,26 @@
                                                                </object>
                                                        </object>
                                                        <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSButtonCell" key="NSCell" id="533593716">
-                                                               <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">134479872</int>
-                                                               <string key="NSContents">Preview</string>
+                                                       <object class="NSSliderCell" key="NSCell" id="257047106">
+                                                               <int key="NSCellFlags">-2079981824</int>
+                                                               <int key="NSCellFlags2">262144</int>
+                                                               <string key="NSContents"/>
                                                                <reference key="NSSupport" ref="22"/>
-                                                               <reference key="NSControlView" ref="892118626"/>
-                                                               <int key="NSButtonFlags">-2038284033</int>
-                                                               <int key="NSButtonFlags2">129</int>
-                                                               <string key="NSAlternateContents"/>
-                                                               <string key="NSKeyEquivalent"/>
-                                                               <int key="NSPeriodicDelay">200</int>
-                                                               <int key="NSPeriodicInterval">25</int>
+                                                               <reference key="NSControlView" ref="581126685"/>
+                                                               <double key="NSMaxValue">1.500000e+01</double>
+                                                               <double key="NSMinValue">4.000000e+00</double>
+                                                               <double key="NSValue">4.000000e+00</double>
+                                                               <double key="NSAltIncValue">0.000000e+00</double>
+                                                               <int key="NSNumberOfTickMarks">12</int>
+                                                               <int key="NSTickMarkPosition">0</int>
+                                                               <bool key="NSAllowsTickMarkValuesOnly">YES</bool>
+                                                               <bool key="NSVertical">NO</bool>
                                                        </object>
                                                </object>
-                                               <object class="NSButton" id="565292660">
+                                               <object class="NSButton" id="76401558">
                                                        <reference key="NSNextResponder" ref="49161063"/>
-                                                       <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{159, 345}, {88, 16}}</string>
+                                                       <int key="NSvFlags">256</int>
+                                                       <string key="NSFrame">{{106, 45}, {19, 18}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                        <object class="NSArray" key="NSViewContentFilters">
@@ -544,19 +1036,26 @@
                                                                                <float key="blue">7.019608e-01</float>
                                                                                <float key="alpha">1.000000e+00</float>
                                                                        </object>
-                                                                       <reference key="CI_inputIntensity" ref="559925184"/>
+                                                                       <real value="1.000000e+00" key="CI_inputIntensity"/>
                                                                        <bool key="CIEnabled">YES</bool>
                                                                </object>
                                                        </object>
                                                        <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSButtonCell" key="NSCell" id="297585337">
+                                                       <object class="NSButtonCell" key="NSCell" id="691700404">
                                                                <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">134479872</int>
-                                                               <string key="NSContents">Picture Size</string>
-                                                               <reference key="NSSupport" ref="22"/>
-                                                               <reference key="NSControlView" ref="565292660"/>
-                                                               <int key="NSButtonFlags">-2038284033</int>
-                                                               <int key="NSButtonFlags2">129</int>
+                                                               <int key="NSCellFlags2">131072</int>
+                                                               <string key="NSContents">Check</string>
+                                                               <reference key="NSSupport" ref="26"/>
+                                                               <reference key="NSControlView" ref="76401558"/>
+                                                               <int key="NSButtonFlags">1211912703</int>
+                                                               <int key="NSButtonFlags2">130</int>
+                                                               <object class="NSCustomResource" key="NSNormalImage">
+                                                                       <string key="NSClassName">NSImage</string>
+                                                                       <string key="NSResourceName">NSSwitch</string>
+                                                               </object>
+                                                               <object class="NSButtonImageSource" key="NSAlternateImage">
+                                                                       <string key="NSImageName">NSSwitch</string>
+                                                               </object>
                                                                <string key="NSAlternateContents"/>
                                                                <string key="NSKeyEquivalent"/>
                                                                <int key="NSPeriodicDelay">200</int>
@@ -564,7 +1063,7 @@
                                                        </object>
                                                </object>
                                        </object>
-                                       <string key="NSFrameSize">{266, 373}</string>
+                                       <string key="NSFrameSize">{267, 380}</string>
                                        <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -577,459 +1076,846 @@
                                <bool key="EncodedWithXMLCoder">YES</bool>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDeinterlacePopUp</string>
+                                               <string key="label">fDeblockSlider</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="346912008"/>
+                                               <reference key="destination" ref="581126685"/>
                                        </object>
-                                       <int key="connectionID">62</int>
+                                       <int key="connectionID">202</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDenoisePopUp</string>
+                                               <string key="label">fDeblockField</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="243795165"/>
+                                               <reference key="destination" ref="314638156"/>
                                        </object>
-                                       <int key="connectionID">63</int>
+                                       <int key="connectionID">206</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDetelecineCheck</string>
+                                               <string key="label">fPreviewOpenButton</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="407610327"/>
+                                               <reference key="destination" ref="892118626"/>
                                        </object>
-                                       <int key="connectionID">64</int>
+                                       <int key="connectionID">272</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDeblockSlider</string>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">showPreviewWindow:</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="892118626"/>
+                                       </object>
+                                       <int key="connectionID">273</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">deblockSliderChanged:</string>
                                                <reference key="source" ref="355312334"/>
                                                <reference key="destination" ref="581126685"/>
                                        </object>
-                                       <int key="connectionID">202</int>
+                                       <int key="connectionID">278</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDeblockField</string>
+                                               <string key="label">fFilterWindow</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="314638156"/>
+                                               <reference key="destination" ref="616825745"/>
                                        </object>
-                                       <int key="connectionID">206</int>
+                                       <int key="connectionID">280</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDecombCheck</string>
+                                               <string key="label">window</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="974850032"/>
+                                               <reference key="destination" ref="616825745"/>
                                        </object>
-                                       <int key="connectionID">238</int>
+                                       <int key="connectionID">281</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPictureFilterBox</string>
+                                               <string key="label">fPictureSizeOpenButton</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="309105014"/>
+                                               <reference key="destination" ref="565292660"/>
                                        </object>
-                                       <int key="connectionID">243</int>
+                                       <int key="connectionID">284</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">showPictureSettingsWindow:</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="565292660"/>
+                                       </object>
+                                       <int key="connectionID">285</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPreviewOpenButton</string>
+                                               <string key="label">fDetelecineBox</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="892118626"/>
+                                               <reference key="destination" ref="64221025"/>
                                        </object>
-                                       <int key="connectionID">272</int>
+                                       <int key="connectionID">287</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">showPreviewWindow:</string>
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDetelecinePopUp</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="892118626"/>
+                                               <reference key="destination" ref="125588808"/>
                                        </object>
-                                       <int key="connectionID">273</int>
+                                       <int key="connectionID">295</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">FilterSettingsChanged:</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="407610327"/>
+                                               <reference key="destination" ref="125588808"/>
                                        </object>
-                                       <int key="connectionID">275</int>
+                                       <int key="connectionID">296</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDetelecineField</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="842296247"/>
+                                       </object>
+                                       <int key="connectionID">301</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDecombBox</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="163128165"/>
+                                       </object>
+                                       <int key="connectionID">316</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDecombField</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="1033588876"/>
+                                       </object>
+                                       <int key="connectionID">317</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">FilterSettingsChanged:</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="346912008"/>
+                                               <reference key="destination" ref="267145969"/>
+                                       </object>
+                                       <int key="connectionID">318</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDeinterlaceField</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="431580657"/>
+                                       </object>
+                                       <int key="connectionID">333</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDeinterlacePopUp</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="254048379"/>
                                        </object>
-                                       <int key="connectionID">276</int>
+                                       <int key="connectionID">334</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">FilterSettingsChanged:</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="243795165"/>
+                                               <reference key="destination" ref="254048379"/>
                                        </object>
-                                       <int key="connectionID">277</int>
+                                       <int key="connectionID">335</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDecombPopUp</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="267145969"/>
+                                       </object>
+                                       <int key="connectionID">336</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDecombDeinterlaceBox</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="1016849337"/>
+                                       </object>
+                                       <int key="connectionID">358</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDecombDeinterlaceSlider</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="915194693"/>
+                                       </object>
+                                       <int key="connectionID">359</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
-                                               <string key="label">deblockSliderChanged:</string>
+                                               <string key="label">modeDecombDeinterlaceSliderChanged:</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="581126685"/>
+                                               <reference key="destination" ref="915194693"/>
                                        </object>
-                                       <int key="connectionID">278</int>
+                                       <int key="connectionID">360</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDeinterlaceBox</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="330241286"/>
+                                       </object>
+                                       <int key="connectionID">361</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDenoisePopUp</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="909105719"/>
+                                       </object>
+                                       <int key="connectionID">375</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDenoiseBox</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="726562036"/>
+                                       </object>
+                                       <int key="connectionID">376</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDenoiseField</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="166645029"/>
+                                       </object>
+                                       <int key="connectionID">377</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">FilterSettingsChanged:</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="974850032"/>
+                                               <reference key="destination" ref="909105719"/>
                                        </object>
-                                       <int key="connectionID">279</int>
+                                       <int key="connectionID">378</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fFilterWindow</string>
+                                               <string key="label">fGrayscaleCheck</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="616825745"/>
+                                               <reference key="destination" ref="76401558"/>
                                        </object>
-                                       <int key="connectionID">280</int>
+                                       <int key="connectionID">383</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">window</string>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">FilterSettingsChanged:</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="616825745"/>
+                                               <reference key="destination" ref="76401558"/>
+                                       </object>
+                                       <int key="connectionID">384</int>
+                               </object>
+                       </object>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <object class="NSArray" key="orderedObjects">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">0</int>
+                                               <object class="NSArray" key="object" id="48079043">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                               </object>
+                                               <reference key="children" ref="273418435"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-2</int>
+                                               <reference key="object" ref="355312334"/>
+                                               <reference key="parent" ref="48079043"/>
+                                               <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-1</int>
+                                               <reference key="object" ref="844574444"/>
+                                               <reference key="parent" ref="48079043"/>
+                                               <string key="objectName">First Responder</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-3</int>
+                                               <reference key="object" ref="837220151"/>
+                                               <reference key="parent" ref="48079043"/>
+                                               <string key="objectName">Application</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">5</int>
+                                               <reference key="object" ref="616825745"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="49161063"/>
+                                               </object>
+                                               <reference key="parent" ref="48079043"/>
+                                               <string key="objectName">PictureFiltersPanel</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">6</int>
+                                               <reference key="object" ref="49161063"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="892118626"/>
+                                                       <reference ref="565292660"/>
+                                                       <reference ref="64221025"/>
+                                                       <reference ref="1016849337"/>
+                                                       <reference ref="726562036"/>
+                                                       <reference ref="314638156"/>
+                                                       <reference ref="1069536323"/>
+                                                       <reference ref="76401558"/>
+                                                       <reference ref="225452500"/>
+                                                       <reference ref="581126685"/>
+                                               </object>
+                                               <reference key="parent" ref="616825745"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">270</int>
+                                               <reference key="object" ref="892118626"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="533593716"/>
+                                               </object>
+                                               <reference key="parent" ref="49161063"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">271</int>
+                                               <reference key="object" ref="533593716"/>
+                                               <reference key="parent" ref="892118626"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">282</int>
+                                               <reference key="object" ref="565292660"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="297585337"/>
+                                               </object>
+                                               <reference key="parent" ref="49161063"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">283</int>
+                                               <reference key="object" ref="297585337"/>
+                                               <reference key="parent" ref="565292660"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">286</int>
+                                               <reference key="object" ref="64221025"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="57714806"/>
+                                                       <reference ref="125588808"/>
+                                                       <reference ref="212403497"/>
+                                                       <reference ref="842296247"/>
+                                               </object>
+                                               <reference key="parent" ref="49161063"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">246</int>
+                                               <reference key="object" ref="57714806"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="456341790"/>
+                                               </object>
+                                               <reference key="parent" ref="64221025"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">247</int>
+                                               <reference key="object" ref="456341790"/>
+                                               <reference key="parent" ref="57714806"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">289</int>
+                                               <reference key="object" ref="125588808"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="628863333"/>
+                                               </object>
+                                               <reference key="parent" ref="64221025"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">290</int>
+                                               <reference key="object" ref="628863333"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="943667172"/>
+                                               </object>
+                                               <reference key="parent" ref="125588808"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">291</int>
+                                               <reference key="object" ref="943667172"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="786951015"/>
+                                                       <reference ref="8089114"/>
+                                                       <reference ref="117354995"/>
+                                               </object>
+                                               <reference key="parent" ref="628863333"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">292</int>
+                                               <reference key="object" ref="786951015"/>
+                                               <reference key="parent" ref="943667172"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">293</int>
+                                               <reference key="object" ref="8089114"/>
+                                               <reference key="parent" ref="943667172"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">294</int>
+                                               <reference key="object" ref="117354995"/>
+                                               <reference key="parent" ref="943667172"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">297</int>
+                                               <reference key="object" ref="842296247"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="933082508"/>
+                                               </object>
+                                               <reference key="parent" ref="64221025"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">298</int>
+                                               <reference key="object" ref="933082508"/>
+                                               <reference key="parent" ref="842296247"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">299</int>
+                                               <reference key="object" ref="212403497"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="534181221"/>
+                                               </object>
+                                               <reference key="parent" ref="64221025"/>
                                        </object>
-                                       <int key="connectionID">281</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPictureSizeOpenButton</string>
-                                               <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="565292660"/>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">300</int>
+                                               <reference key="object" ref="534181221"/>
+                                               <reference key="parent" ref="212403497"/>
                                        </object>
-                                       <int key="connectionID">284</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">showPictureSettingsWindow:</string>
-                                               <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="565292660"/>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">341</int>
+                                               <reference key="object" ref="1016849337"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="163128165"/>
+                                                       <reference ref="330241286"/>
+                                                       <reference ref="915194693"/>
+                                                       <reference ref="1008481607"/>
+                                                       <reference ref="915187908"/>
+                                               </object>
+                                               <reference key="parent" ref="49161063"/>
                                        </object>
-                                       <int key="connectionID">285</int>
-                               </object>
-                       </object>
-                       <object class="IBMutableOrderedSet" key="objectRecords">
-                               <object class="NSArray" key="orderedObjects">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
-                                               <object class="NSArray" key="object" id="48079043">
+                                               <int key="objectID">337</int>
+                                               <reference key="object" ref="915194693"/>
+                                               <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="220344376"/>
                                                </object>
-                                               <reference key="children" ref="273418435"/>
-                                               <nil key="parent"/>
+                                               <reference key="parent" ref="1016849337"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
-                                               <reference key="object" ref="355312334"/>
-                                               <reference key="parent" ref="48079043"/>
-                                               <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+                                               <int key="objectID">338</int>
+                                               <reference key="object" ref="220344376"/>
+                                               <reference key="parent" ref="915194693"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
-                                               <reference key="object" ref="844574444"/>
-                                               <reference key="parent" ref="48079043"/>
-                                               <string key="objectName">First Responder</string>
+                                               <int key="objectID">339</int>
+                                               <reference key="object" ref="1008481607"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="32705166"/>
+                                               </object>
+                                               <reference key="parent" ref="1016849337"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">-3</int>
-                                               <reference key="object" ref="837220151"/>
-                                               <reference key="parent" ref="48079043"/>
-                                               <string key="objectName">Application</string>
+                                               <int key="objectID">340</int>
+                                               <reference key="object" ref="32705166"/>
+                                               <reference key="parent" ref="1008481607"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
-                                               <reference key="object" ref="616825745"/>
+                                               <int key="objectID">356</int>
+                                               <reference key="object" ref="915187908"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="49161063"/>
+                                                       <reference ref="801326190"/>
                                                </object>
-                                               <reference key="parent" ref="48079043"/>
-                                               <string key="objectName">PictureFiltersPanel</string>
+                                               <reference key="parent" ref="1016849337"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
-                                               <reference key="object" ref="49161063"/>
+                                               <int key="objectID">357</int>
+                                               <reference key="object" ref="801326190"/>
+                                               <reference key="parent" ref="915187908"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">302</int>
+                                               <reference key="object" ref="163128165"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="892118626"/>
-                                                       <reference ref="309105014"/>
-                                                       <reference ref="565292660"/>
+                                                       <reference ref="212256262"/>
+                                                       <reference ref="267145969"/>
+                                                       <reference ref="173366481"/>
+                                                       <reference ref="1033588876"/>
                                                </object>
-                                               <reference key="parent" ref="616825745"/>
+                                               <reference key="parent" ref="1016849337"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">23</int>
-                                               <reference key="object" ref="309105014"/>
+                                               <int key="objectID">306</int>
+                                               <reference key="object" ref="212256262"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="243795165"/>
-                                                       <reference ref="346912008"/>
-                                                       <reference ref="905607845"/>
-                                                       <reference ref="94419441"/>
-                                                       <reference ref="581126685"/>
-                                                       <reference ref="1069536323"/>
-                                                       <reference ref="314638156"/>
-                                                       <reference ref="974850032"/>
-                                                       <reference ref="407610327"/>
-                                                       <reference ref="57714806"/>
-                                                       <reference ref="762149330"/>
+                                                       <reference ref="719157144"/>
                                                </object>
-                                               <reference key="parent" ref="49161063"/>
+                                               <reference key="parent" ref="163128165"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">32</int>
-                                               <reference key="object" ref="346912008"/>
+                                               <int key="objectID">305</int>
+                                               <reference key="object" ref="267145969"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1034367716"/>
+                                                       <reference ref="522037822"/>
                                                </object>
-                                               <reference key="parent" ref="309105014"/>
+                                               <reference key="parent" ref="163128165"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">161</int>
-                                               <reference key="object" ref="1034367716"/>
+                                               <int key="objectID">304</int>
+                                               <reference key="object" ref="173366481"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="132523332"/>
+                                                       <reference ref="554741989"/>
                                                </object>
-                                               <reference key="parent" ref="346912008"/>
+                                               <reference key="parent" ref="163128165"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">33</int>
-                                               <reference key="object" ref="132523332"/>
+                                               <int key="objectID">303</int>
+                                               <reference key="object" ref="1033588876"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="937797455"/>
-                                                       <reference ref="71282261"/>
-                                                       <reference ref="542784764"/>
+                                                       <reference ref="493007225"/>
                                                </object>
-                                               <reference key="parent" ref="1034367716"/>
+                                               <reference key="parent" ref="163128165"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">34</int>
-                                               <reference key="object" ref="937797455"/>
-                                               <reference key="parent" ref="132523332"/>
+                                               <int key="objectID">314</int>
+                                               <reference key="object" ref="493007225"/>
+                                               <reference key="parent" ref="1033588876"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">35</int>
-                                               <reference key="object" ref="71282261"/>
-                                               <reference key="parent" ref="132523332"/>
+                                               <int key="objectID">313</int>
+                                               <reference key="object" ref="554741989"/>
+                                               <reference key="parent" ref="173366481"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">36</int>
-                                               <reference key="object" ref="542784764"/>
-                                               <reference key="parent" ref="132523332"/>
+                                               <int key="objectID">308</int>
+                                               <reference key="object" ref="522037822"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="498815766"/>
+                                               </object>
+                                               <reference key="parent" ref="267145969"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">30</int>
-                                               <reference key="object" ref="905607845"/>
+                                               <int key="objectID">309</int>
+                                               <reference key="object" ref="498815766"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="522867811"/>
+                                                       <reference ref="679002198"/>
+                                                       <reference ref="941926270"/>
+                                                       <reference ref="765424858"/>
                                                </object>
-                                               <reference key="parent" ref="309105014"/>
+                                               <reference key="parent" ref="522037822"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">312</int>
+                                               <reference key="object" ref="679002198"/>
+                                               <reference key="parent" ref="498815766"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">311</int>
+                                               <reference key="object" ref="941926270"/>
+                                               <reference key="parent" ref="498815766"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">310</int>
+                                               <reference key="object" ref="765424858"/>
+                                               <reference key="parent" ref="498815766"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">159</int>
-                                               <reference key="object" ref="522867811"/>
-                                               <reference key="parent" ref="905607845"/>
+                                               <int key="objectID">307</int>
+                                               <reference key="object" ref="719157144"/>
+                                               <reference key="parent" ref="212256262"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">37</int>
-                                               <reference key="object" ref="407610327"/>
+                                               <int key="objectID">319</int>
+                                               <reference key="object" ref="330241286"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="832714893"/>
+                                                       <reference ref="241774821"/>
+                                                       <reference ref="321610274"/>
+                                                       <reference ref="431580657"/>
+                                                       <reference ref="254048379"/>
                                                </object>
-                                               <reference key="parent" ref="309105014"/>
+                                               <reference key="parent" ref="1016849337"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">162</int>
-                                               <reference key="object" ref="832714893"/>
-                                               <reference key="parent" ref="407610327"/>
+                                               <int key="objectID">320</int>
+                                               <reference key="object" ref="241774821"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="823247511"/>
+                                               </object>
+                                               <reference key="parent" ref="330241286"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">25</int>
-                                               <reference key="object" ref="243795165"/>
+                                               <int key="objectID">321</int>
+                                               <reference key="object" ref="254048379"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="708528272"/>
+                                                       <reference ref="856636688"/>
                                                </object>
-                                               <reference key="parent" ref="309105014"/>
+                                               <reference key="parent" ref="330241286"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">158</int>
-                                               <reference key="object" ref="708528272"/>
+                                               <int key="objectID">322</int>
+                                               <reference key="object" ref="321610274"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="176321383"/>
+                                                       <reference ref="339882403"/>
                                                </object>
-                                               <reference key="parent" ref="243795165"/>
+                                               <reference key="parent" ref="330241286"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">26</int>
-                                               <reference key="object" ref="176321383"/>
+                                               <int key="objectID">323</int>
+                                               <reference key="object" ref="431580657"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="114494573"/>
-                                                       <reference ref="750998660"/>
-                                                       <reference ref="133285043"/>
+                                                       <reference ref="109957268"/>
                                                </object>
-                                               <reference key="parent" ref="708528272"/>
+                                               <reference key="parent" ref="330241286"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">27</int>
-                                               <reference key="object" ref="114494573"/>
-                                               <reference key="parent" ref="176321383"/>
+                                               <int key="objectID">324</int>
+                                               <reference key="object" ref="109957268"/>
+                                               <reference key="parent" ref="431580657"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">28</int>
-                                               <reference key="object" ref="750998660"/>
-                                               <reference key="parent" ref="176321383"/>
+                                               <int key="objectID">325</int>
+                                               <reference key="object" ref="339882403"/>
+                                               <reference key="parent" ref="321610274"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">29</int>
-                                               <reference key="object" ref="133285043"/>
-                                               <reference key="parent" ref="176321383"/>
+                                               <int key="objectID">326</int>
+                                               <reference key="object" ref="856636688"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="305994847"/>
+                                               </object>
+                                               <reference key="parent" ref="254048379"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">31</int>
-                                               <reference key="object" ref="94419441"/>
+                                               <int key="objectID">327</int>
+                                               <reference key="object" ref="305994847"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="741873280"/>
+                                                       <reference ref="71113963"/>
+                                                       <reference ref="593929782"/>
+                                                       <reference ref="466450876"/>
                                                </object>
-                                               <reference key="parent" ref="309105014"/>
+                                               <reference key="parent" ref="856636688"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">160</int>
-                                               <reference key="object" ref="741873280"/>
-                                               <reference key="parent" ref="94419441"/>
+                                               <int key="objectID">328</int>
+                                               <reference key="object" ref="71113963"/>
+                                               <reference key="parent" ref="305994847"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">195</int>
-                                               <reference key="object" ref="581126685"/>
+                                               <int key="objectID">329</int>
+                                               <reference key="object" ref="593929782"/>
+                                               <reference key="parent" ref="305994847"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">330</int>
+                                               <reference key="object" ref="466450876"/>
+                                               <reference key="parent" ref="305994847"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">331</int>
+                                               <reference key="object" ref="823247511"/>
+                                               <reference key="parent" ref="241774821"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">362</int>
+                                               <reference key="object" ref="726562036"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="257047106"/>
+                                                       <reference ref="166645029"/>
+                                                       <reference ref="957122238"/>
+                                                       <reference ref="909105719"/>
+                                                       <reference ref="548934652"/>
                                                </object>
-                                               <reference key="parent" ref="309105014"/>
+                                               <reference key="parent" ref="49161063"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">196</int>
-                                               <reference key="object" ref="257047106"/>
-                                               <reference key="parent" ref="581126685"/>
+                                               <int key="objectID">363</int>
+                                               <reference key="object" ref="166645029"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="415949117"/>
+                                               </object>
+                                               <reference key="parent" ref="726562036"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">197</int>
-                                               <reference key="object" ref="1069536323"/>
+                                               <int key="objectID">364</int>
+                                               <reference key="object" ref="957122238"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="728722104"/>
+                                                       <reference ref="927749651"/>
                                                </object>
-                                               <reference key="parent" ref="309105014"/>
+                                               <reference key="parent" ref="726562036"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">198</int>
-                                               <reference key="object" ref="728722104"/>
-                                               <reference key="parent" ref="1069536323"/>
+                                               <int key="objectID">365</int>
+                                               <reference key="object" ref="909105719"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="928502475"/>
+                                               </object>
+                                               <reference key="parent" ref="726562036"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">204</int>
-                                               <reference key="object" ref="314638156"/>
+                                               <int key="objectID">366</int>
+                                               <reference key="object" ref="548934652"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="350598908"/>
+                                                       <reference ref="1060377661"/>
                                                </object>
-                                               <reference key="parent" ref="309105014"/>
+                                               <reference key="parent" ref="726562036"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">205</int>
-                                               <reference key="object" ref="350598908"/>
-                                               <reference key="parent" ref="314638156"/>
+                                               <int key="objectID">367</int>
+                                               <reference key="object" ref="1060377661"/>
+                                               <reference key="parent" ref="548934652"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">368</int>
+                                               <reference key="object" ref="928502475"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="317487076"/>
+                                               </object>
+                                               <reference key="parent" ref="909105719"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">236</int>
-                                               <reference key="object" ref="974850032"/>
+                                               <int key="objectID">369</int>
+                                               <reference key="object" ref="317487076"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="464410464"/>
+                                                       <reference ref="852213231"/>
+                                                       <reference ref="847528775"/>
+                                                       <reference ref="580567864"/>
                                                </object>
-                                               <reference key="parent" ref="309105014"/>
+                                               <reference key="parent" ref="928502475"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">237</int>
-                                               <reference key="object" ref="464410464"/>
-                                               <reference key="parent" ref="974850032"/>
+                                               <int key="objectID">370</int>
+                                               <reference key="object" ref="852213231"/>
+                                               <reference key="parent" ref="317487076"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">246</int>
-                                               <reference key="object" ref="57714806"/>
+                                               <int key="objectID">371</int>
+                                               <reference key="object" ref="847528775"/>
+                                               <reference key="parent" ref="317487076"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">372</int>
+                                               <reference key="object" ref="580567864"/>
+                                               <reference key="parent" ref="317487076"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">373</int>
+                                               <reference key="object" ref="927749651"/>
+                                               <reference key="parent" ref="957122238"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">374</int>
+                                               <reference key="object" ref="415949117"/>
+                                               <reference key="parent" ref="166645029"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">197</int>
+                                               <reference key="object" ref="1069536323"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="456341790"/>
+                                                       <reference ref="728722104"/>
                                                </object>
-                                               <reference key="parent" ref="309105014"/>
+                                               <reference key="parent" ref="49161063"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">247</int>
-                                               <reference key="object" ref="456341790"/>
-                                               <reference key="parent" ref="57714806"/>
+                                               <int key="objectID">198</int>
+                                               <reference key="object" ref="728722104"/>
+                                               <reference key="parent" ref="1069536323"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">248</int>
-                                               <reference key="object" ref="762149330"/>
+                                               <int key="objectID">204</int>
+                                               <reference key="object" ref="314638156"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="192583280"/>
+                                                       <reference ref="350598908"/>
                                                </object>
-                                               <reference key="parent" ref="309105014"/>
+                                               <reference key="parent" ref="49161063"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">249</int>
-                                               <reference key="object" ref="192583280"/>
-                                               <reference key="parent" ref="762149330"/>
+                                               <int key="objectID">205</int>
+                                               <reference key="object" ref="350598908"/>
+                                               <reference key="parent" ref="314638156"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">270</int>
-                                               <reference key="object" ref="892118626"/>
+                                               <int key="objectID">195</int>
+                                               <reference key="object" ref="581126685"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="533593716"/>
+                                                       <reference ref="257047106"/>
                                                </object>
                                                <reference key="parent" ref="49161063"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">271</int>
-                                               <reference key="object" ref="533593716"/>
-                                               <reference key="parent" ref="892118626"/>
+                                               <int key="objectID">196</int>
+                                               <reference key="object" ref="257047106"/>
+                                               <reference key="parent" ref="581126685"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">282</int>
-                                               <reference key="object" ref="565292660"/>
+                                               <int key="objectID">379</int>
+                                               <reference key="object" ref="76401558"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="297585337"/>
+                                                       <reference ref="691700404"/>
                                                </object>
                                                <reference key="parent" ref="49161063"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">283</int>
-                                               <reference key="object" ref="297585337"/>
-                                               <reference key="parent" ref="565292660"/>
+                                               <int key="objectID">380</int>
+                                               <reference key="object" ref="691700404"/>
+                                               <reference key="parent" ref="76401558"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">381</int>
+                                               <reference key="object" ref="225452500"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="27390208"/>
+                                               </object>
+                                               <reference key="parent" ref="49161063"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">382</int>
+                                               <reference key="object" ref="27390208"/>
+                                               <reference key="parent" ref="225452500"/>
                                        </object>
                                </object>
                        </object>
@@ -1041,11 +1927,6 @@
                                        <string>-2.IBPluginDependency</string>
                                        <string>-3.IBPluginDependency</string>
                                        <string>-3.ImportedFromIB2</string>
-                                       <string>158.IBPluginDependency</string>
-                                       <string>159.IBPluginDependency</string>
-                                       <string>160.IBPluginDependency</string>
-                                       <string>161.IBPluginDependency</string>
-                                       <string>162.IBPluginDependency</string>
                                        <string>195.IBPluginDependency</string>
                                        <string>195.IBViewIntegration.shadowBlurRadius</string>
                                        <string>195.IBViewIntegration.shadowColor</string>
@@ -1058,47 +1939,111 @@
                                        <string>204.IBPluginDependency</string>
                                        <string>204.ImportedFromIB2</string>
                                        <string>205.IBPluginDependency</string>
-                                       <string>23.IBPluginDependency</string>
-                                       <string>23.ImportedFromIB2</string>
-                                       <string>236.IBPluginDependency</string>
-                                       <string>236.ImportedFromIB2</string>
-                                       <string>237.IBPluginDependency</string>
                                        <string>246.IBPluginDependency</string>
                                        <string>246.ImportedFromIB2</string>
                                        <string>247.IBPluginDependency</string>
-                                       <string>248.IBPluginDependency</string>
-                                       <string>248.ImportedFromIB2</string>
-                                       <string>249.IBPluginDependency</string>
-                                       <string>25.IBPluginDependency</string>
-                                       <string>25.ImportedFromIB2</string>
-                                       <string>26.IBPluginDependency</string>
-                                       <string>26.ImportedFromIB2</string>
-                                       <string>27.IBPluginDependency</string>
-                                       <string>27.ImportedFromIB2</string>
                                        <string>270.IBPluginDependency</string>
                                        <string>271.IBPluginDependency</string>
-                                       <string>28.IBPluginDependency</string>
-                                       <string>28.ImportedFromIB2</string>
                                        <string>282.IBPluginDependency</string>
                                        <string>283.IBPluginDependency</string>
-                                       <string>29.IBPluginDependency</string>
-                                       <string>29.ImportedFromIB2</string>
-                                       <string>30.IBPluginDependency</string>
-                                       <string>30.ImportedFromIB2</string>
-                                       <string>31.IBPluginDependency</string>
-                                       <string>31.ImportedFromIB2</string>
-                                       <string>32.IBPluginDependency</string>
-                                       <string>32.ImportedFromIB2</string>
-                                       <string>33.IBPluginDependency</string>
-                                       <string>33.ImportedFromIB2</string>
-                                       <string>34.IBPluginDependency</string>
-                                       <string>34.ImportedFromIB2</string>
-                                       <string>35.IBPluginDependency</string>
-                                       <string>35.ImportedFromIB2</string>
-                                       <string>36.IBPluginDependency</string>
-                                       <string>36.ImportedFromIB2</string>
-                                       <string>37.IBPluginDependency</string>
-                                       <string>37.ImportedFromIB2</string>
+                                       <string>286.IBPluginDependency</string>
+                                       <string>289.IBPluginDependency</string>
+                                       <string>289.ImportedFromIB2</string>
+                                       <string>290.IBPluginDependency</string>
+                                       <string>291.IBPluginDependency</string>
+                                       <string>291.ImportedFromIB2</string>
+                                       <string>292.IBPluginDependency</string>
+                                       <string>292.ImportedFromIB2</string>
+                                       <string>293.IBPluginDependency</string>
+                                       <string>293.ImportedFromIB2</string>
+                                       <string>294.IBPluginDependency</string>
+                                       <string>294.ImportedFromIB2</string>
+                                       <string>297.IBPluginDependency</string>
+                                       <string>298.IBPluginDependency</string>
+                                       <string>299.IBPluginDependency</string>
+                                       <string>299.ImportedFromIB2</string>
+                                       <string>300.IBPluginDependency</string>
+                                       <string>302.IBPluginDependency</string>
+                                       <string>303.IBPluginDependency</string>
+                                       <string>304.IBPluginDependency</string>
+                                       <string>304.ImportedFromIB2</string>
+                                       <string>305.IBPluginDependency</string>
+                                       <string>305.ImportedFromIB2</string>
+                                       <string>306.IBPluginDependency</string>
+                                       <string>306.ImportedFromIB2</string>
+                                       <string>307.IBPluginDependency</string>
+                                       <string>308.IBPluginDependency</string>
+                                       <string>309.IBEditorWindowLastContentRect</string>
+                                       <string>309.IBPluginDependency</string>
+                                       <string>309.ImportedFromIB2</string>
+                                       <string>310.IBPluginDependency</string>
+                                       <string>310.ImportedFromIB2</string>
+                                       <string>311.IBPluginDependency</string>
+                                       <string>311.ImportedFromIB2</string>
+                                       <string>312.IBPluginDependency</string>
+                                       <string>312.ImportedFromIB2</string>
+                                       <string>313.IBPluginDependency</string>
+                                       <string>314.IBPluginDependency</string>
+                                       <string>319.IBPluginDependency</string>
+                                       <string>320.IBPluginDependency</string>
+                                       <string>320.ImportedFromIB2</string>
+                                       <string>321.IBPluginDependency</string>
+                                       <string>321.ImportedFromIB2</string>
+                                       <string>322.IBPluginDependency</string>
+                                       <string>322.ImportedFromIB2</string>
+                                       <string>323.IBPluginDependency</string>
+                                       <string>324.IBPluginDependency</string>
+                                       <string>325.IBPluginDependency</string>
+                                       <string>326.IBPluginDependency</string>
+                                       <string>327.IBEditorWindowLastContentRect</string>
+                                       <string>327.IBPluginDependency</string>
+                                       <string>327.ImportedFromIB2</string>
+                                       <string>328.IBPluginDependency</string>
+                                       <string>328.ImportedFromIB2</string>
+                                       <string>329.IBPluginDependency</string>
+                                       <string>329.ImportedFromIB2</string>
+                                       <string>330.IBPluginDependency</string>
+                                       <string>330.ImportedFromIB2</string>
+                                       <string>331.IBPluginDependency</string>
+                                       <string>337.IBPluginDependency</string>
+                                       <string>337.IBViewIntegration.shadowBlurRadius</string>
+                                       <string>337.IBViewIntegration.shadowColor</string>
+                                       <string>337.IBViewIntegration.shadowOffsetHeight</string>
+                                       <string>337.IBViewIntegration.shadowOffsetWidth</string>
+                                       <string>338.IBPluginDependency</string>
+                                       <string>339.IBPluginDependency</string>
+                                       <string>339.ImportedFromIB2</string>
+                                       <string>340.IBPluginDependency</string>
+                                       <string>341.IBPluginDependency</string>
+                                       <string>341.ImportedFromIB2</string>
+                                       <string>356.IBPluginDependency</string>
+                                       <string>356.ImportedFromIB2</string>
+                                       <string>357.IBPluginDependency</string>
+                                       <string>362.IBPluginDependency</string>
+                                       <string>363.IBPluginDependency</string>
+                                       <string>364.IBPluginDependency</string>
+                                       <string>364.ImportedFromIB2</string>
+                                       <string>365.IBPluginDependency</string>
+                                       <string>365.ImportedFromIB2</string>
+                                       <string>366.IBPluginDependency</string>
+                                       <string>366.ImportedFromIB2</string>
+                                       <string>367.IBPluginDependency</string>
+                                       <string>368.IBPluginDependency</string>
+                                       <string>369.IBPluginDependency</string>
+                                       <string>369.ImportedFromIB2</string>
+                                       <string>370.IBPluginDependency</string>
+                                       <string>370.ImportedFromIB2</string>
+                                       <string>371.IBPluginDependency</string>
+                                       <string>371.ImportedFromIB2</string>
+                                       <string>372.IBPluginDependency</string>
+                                       <string>372.ImportedFromIB2</string>
+                                       <string>373.IBPluginDependency</string>
+                                       <string>374.IBPluginDependency</string>
+                                       <string>379.IBPluginDependency</string>
+                                       <string>380.IBPluginDependency</string>
+                                       <string>381.IBPluginDependency</string>
+                                       <string>381.ImportedFromIB2</string>
+                                       <string>382.IBPluginDependency</string>
                                        <string>5.IBEditorWindowLastContentRect</string>
                                        <string>5.IBViewEditorWindowController.showingLayoutRectangles</string>
                                        <string>5.IBWindowTemplateEditedContentRect</string>
@@ -1118,16 +2063,8 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <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>
                                        <integer value="0" id="8"/>
-                                       <object class="NSColor">
-                                               <int key="NSColorSpace">3</int>
-                                               <bytes key="NSWhite">MAA</bytes>
-                                       </object>
+                                       <reference ref="8204224"/>
                                        <reference ref="8"/>
                                        <reference ref="8"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1140,47 +2077,111 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
+                                       <reference ref="322721602"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
+                                       <reference ref="322721602"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="322721602"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="322721602"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
+                                       <reference ref="322721602"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
+                                       <real value="1.000000e+00"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
+                                       <reference ref="463946280"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
+                                       <reference ref="463946280"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
+                                       <reference ref="463946280"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{873, 640}, {110, 48}}</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="463946280"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="463946280"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="463946280"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="463946280"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="917308943"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="917308943"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="917308943"/>
+                                       <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>{{873, 640}, {110, 48}}</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="917308943"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="917308943"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="917308943"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="917308943"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="8"/>
+                                       <reference ref="8204224"/>
+                                       <reference ref="8"/>
+                                       <reference ref="8"/>
+                                       <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>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="640207679"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="640207679"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="640207679"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="640207679"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="640207679"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="640207679"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="640207679"/>
+                                       <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>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{710, 445}, {267, 380}}</string>
                                        <reference ref="559925184"/>
-                                       <string>{{654, 483}, {266, 373}}</string>
-                                       <reference ref="559925184"/>
-                                       <string>{{654, 483}, {266, 373}}</string>
+                                       <string>{{710, 445}, {267, 380}}</string>
                                        <reference ref="559925184"/>
                                        <string>{{221, 276}, {533, 580}}</string>
                                        <reference ref="8"/>
@@ -1211,7 +2212,7 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">285</int>
+                       <int key="maxID">384</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1239,7 +2240,9 @@
                                                <object class="NSMutableArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>FilterSettingsChanged:</string>
+                                                       <string>adjustFilterDisplay:</string>
                                                        <string>deblockSliderChanged:</string>
+                                                       <string>modeDecombDeinterlaceSliderChanged:</string>
                                                        <string>showFilterWindow:</string>
                                                        <string>showPictureSettingsWindow:</string>
                                                        <string>showPreviewWindow:</string>
@@ -1251,42 +2254,62 @@
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" key="outlets">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSMutableArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>fAnamorphicPopUp</string>
                                                        <string>fDeblockCheck</string>
                                                        <string>fDeblockField</string>
                                                        <string>fDeblockSlider</string>
-                                                       <string>fDecombCheck</string>
+                                                       <string>fDecombBox</string>
+                                                       <string>fDecombDeinterlaceBox</string>
+                                                       <string>fDecombDeinterlaceSlider</string>
+                                                       <string>fDecombField</string>
+                                                       <string>fDecombPopUp</string>
+                                                       <string>fDeinterlaceBox</string>
+                                                       <string>fDeinterlaceField</string>
                                                        <string>fDeinterlacePopUp</string>
+                                                       <string>fDenoiseBox</string>
+                                                       <string>fDenoiseField</string>
                                                        <string>fDenoisePopUp</string>
-                                                       <string>fDetelecineCheck</string>
+                                                       <string>fDetelecineBox</string>
+                                                       <string>fDetelecineField</string>
+                                                       <string>fDetelecinePopUp</string>
                                                        <string>fFilterWindow</string>
+                                                       <string>fGrayscaleCheck</string>
                                                        <string>fInfoField</string>
                                                        <string>fPictureFilterBox</string>
                                                        <string>fPictureSizeOpenButton</string>
-                                                       <string>fPictureSlider</string>
                                                        <string>fPreviewOpenButton</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>NSPopUpButton</string>
                                                        <string>NSButton</string>
                                                        <string>NSTextField</string>
                                                        <string>NSSlider</string>
-                                                       <string>NSButton</string>
+                                                       <string>NSBox</string>
+                                                       <string>NSBox</string>
+                                                       <string>NSSlider</string>
+                                                       <string>NSTextField</string>
                                                        <string>NSPopUpButton</string>
+                                                       <string>NSBox</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSPopUpButton</string>
+                                                       <string>NSBox</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSPopUpButton</string>
+                                                       <string>NSBox</string>
+                                                       <string>NSTextField</string>
                                                        <string>NSPopUpButton</string>
-                                                       <string>NSButton</string>
                                                        <string>NSWindow</string>
+                                                       <string>NSButton</string>
                                                        <string>NSTextField</string>
                                                        <string>NSBox</string>
                                                        <string>NSButton</string>
-                                                       <string>NSSlider</string>
                                                        <string>NSButton</string>
                                                </object>
                                        </object>

diff --git a/macosx/English.lproj/PictureSettings.xib b/macosx/English.lproj/PictureSettings.xib
index 34e8c0011ead75c21ead3747c9e312351e993eef..60b245117fc15ba9b1f1199f672a5e98063267cd 100644 (file)
--- a/macosx/English.lproj/PictureSettings.xib
+++ b/macosx/English.lproj/PictureSettings.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
        <data>
                <int key="IBDocument.SystemTarget">1050</int>
                <string key="IBDocument.SystemVersion">9G55</string>
-               <string key="IBDocument.InterfaceBuilderVersion">670</string>
+               <string key="IBDocument.InterfaceBuilderVersion">677</string>
                <string key="IBDocument.AppKitVersion">949.43</string>
                <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
@@ -14,6 +14,15 @@
                        <bool key="EncodedWithXMLCoder">YES</bool>
                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                </object>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <bool key="EncodedWithXMLCoder">YES</bool>
+                       <object class="NSArray" key="dict.sortedKeys">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                       </object>
+                       <object class="NSMutableArray" key="dict.values">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                       </object>
+               </object>
                <object class="NSMutableArray" key="IBDocument.RootObjects" id="273418435">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                        <object class="NSCustomObject" id="355312334">
@@ -28,14 +37,14 @@
                        <object class="NSWindowTemplate" id="616825745">
                                <int key="NSWindowStyleMask">8215</int>
                                <int key="NSWindowBacking">2</int>
-                               <string key="NSWindowRect">{{1211, 357}, {229, 518}}</string>
+                               <string key="NSWindowRect">{{1211, 357}, {229, 380}}</string>
                                <int key="NSWTFlags">1886913536</int>
                                <string key="NSWindowTitle">Picture Settings</string>
                                <string key="NSWindowClass">NSPanel</string>
                                <object class="NSMutableString" key="NSViewClass">
                                        <characters key="NS.bytes">View</characters>
                                </object>
-                               <string key="NSWindowContentMaxSize">{10000, 10000}</string>
+                               <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"/>
@@ -497,7 +506,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                        <reference key="NSSuperview" ref="1064912113"/>
                                                                </object>
                                                        </object>
-                                                       <string key="NSFrame">{{17, 149}, {193, 161}}</string>
+                                                       <string key="NSFrame">{{17, 11}, {193, 161}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <string key="NSOffsets">{0, 0}</string>
                                                        <object class="NSTextFieldCell" key="NSTitleCell">
@@ -815,7 +824,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                        <reference key="NSSuperview" ref="1011917013"/>
                                                                </object>
                                                        </object>
-                                                       <string key="NSFrame">{{19, 328}, {193, 130}}</string>
+                                                       <string key="NSFrame">{{19, 190}, {193, 130}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <string key="NSOffsets">{0, 0}</string>
                                                        <object class="NSTextFieldCell" key="NSTitleCell">
@@ -873,7 +882,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <object class="NSButton" id="892118626">
                                                        <reference key="NSNextResponder" ref="49161063"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{19, 491}, {57, 16}}</string>
+                                                       <string key="NSFrame">{{19, 344}, {57, 25}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                        <object class="NSArray" key="NSViewContentFilters">
@@ -897,7 +906,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                <reference key="NSSupport" ref="22"/>
                                                                <reference key="NSControlView" ref="892118626"/>
                                                                <int key="NSButtonFlags">-2038284033</int>
-                                                               <int key="NSButtonFlags2">129</int>
+                                                               <int key="NSButtonFlags2">163</int>
                                                                <string key="NSAlternateContents"/>
                                                                <string key="NSKeyEquivalent"/>
                                                                <int key="NSPeriodicDelay">200</int>
@@ -907,7 +916,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <object class="NSButton" id="91459209">
                                                        <reference key="NSNextResponder" ref="49161063"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{118, 491}, {84, 16}}</string>
+                                                       <string key="NSFrame">{{118, 344}, {84, 25}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                        <object class="NSArray" key="NSViewContentFilters">
@@ -931,7 +940,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                <reference key="NSSupport" ref="22"/>
                                                                <reference key="NSControlView" ref="91459209"/>
                                                                <int key="NSButtonFlags">-2038284033</int>
-                                                               <int key="NSButtonFlags2">129</int>
+                                                               <int key="NSButtonFlags2">163</int>
                                                                <string key="NSAlternateContents"/>
                                                                <string key="NSKeyEquivalent"/>
                                                                <int key="NSPeriodicDelay">200</int>
@@ -939,7 +948,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        </object>
                                                </object>
                                        </object>
-                                       <string key="NSFrameSize">{229, 518}</string>
+                                       <string key="NSFrameSize">{229, 380}</string>
                                        <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -1721,26 +1730,49 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <string>138.ImportedFromIB2</string>
                                        <string>14.IBPluginDependency</string>
                                        <string>14.ImportedFromIB2</string>
+                                       <string>149.IBPluginDependency</string>
                                        <string>15.IBPluginDependency</string>
                                        <string>15.ImportedFromIB2</string>
+                                       <string>150.IBPluginDependency</string>
+                                       <string>151.IBPluginDependency</string>
+                                       <string>152.IBPluginDependency</string>
+                                       <string>153.IBPluginDependency</string>
+                                       <string>154.IBPluginDependency</string>
+                                       <string>155.IBPluginDependency</string>
+                                       <string>156.IBPluginDependency</string>
                                        <string>16.IBPluginDependency</string>
                                        <string>16.ImportedFromIB2</string>
+                                       <string>166.IBPluginDependency</string>
+                                       <string>167.IBPluginDependency</string>
+                                       <string>168.IBPluginDependency</string>
+                                       <string>169.IBPluginDependency</string>
                                        <string>17.IBPluginDependency</string>
                                        <string>17.ImportedFromIB2</string>
+                                       <string>170.IBPluginDependency</string>
+                                       <string>171.IBPluginDependency</string>
+                                       <string>172.IBPluginDependency</string>
+                                       <string>173.IBPluginDependency</string>
+                                       <string>174.IBPluginDependency</string>
+                                       <string>178.IBPluginDependency</string>
                                        <string>18.IBPluginDependency</string>
                                        <string>18.ImportedFromIB2</string>
                                        <string>19.IBPluginDependency</string>
                                        <string>19.ImportedFromIB2</string>
                                        <string>244.IBPluginDependency</string>
                                        <string>244.ImportedFromIB2</string>
+                                       <string>245.IBPluginDependency</string>
                                        <string>250.IBPluginDependency</string>
                                        <string>250.ImportedFromIB2</string>
+                                       <string>251.IBPluginDependency</string>
                                        <string>252.IBPluginDependency</string>
                                        <string>252.ImportedFromIB2</string>
+                                       <string>253.IBPluginDependency</string>
                                        <string>260.IBPluginDependency</string>
                                        <string>260.ImportedFromIB2</string>
+                                       <string>261.IBPluginDependency</string>
                                        <string>262.IBPluginDependency</string>
                                        <string>262.ImportedFromIB2</string>
+                                       <string>263.IBPluginDependency</string>
                                        <string>270.IBPluginDependency</string>
                                        <string>271.IBPluginDependency</string>
                                        <string>274.IBPluginDependency</string>
@@ -1762,7 +1794,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <string>47.IBPluginDependency</string>
                                        <string>47.ImportedFromIB2</string>
                                        <string>5.IBEditorWindowLastContentRect</string>
-                                       <string>5.IBPluginDependency</string>
                                        <string>5.IBViewEditorWindowController.showingLayoutRectangles</string>
                                        <string>5.IBWindowTemplateEditedContentRect</string>
                                        <string>5.ImportedFromIB2</string>
@@ -1807,31 +1838,52 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <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>
                                        <reference ref="559925184"/>
                                        <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>
                                        <reference ref="559925184"/>
                                        <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>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <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>
-                                       <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1846,10 +1898,11 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
-                                       <string>{{423, 339}, {229, 518}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
-                                       <string>{{423, 339}, {229, 518}}</string>
+                                       <string>{{481, 445}, {229, 380}}</string>
+                                       <reference ref="559925184"/>
+                                       <string>{{481, 445}, {229, 380}}</string>
                                        <reference ref="559925184"/>
                                        <string>{{221, 276}, {533, 580}}</string>
                                        <reference ref="8"/>

diff --git a/macosx/HBFilterController.h b/macosx/HBFilterController.h
index 1bfde5be3e6d468618e0b00c2c1c7b17f9dd8fa6..d2b224c76f179406f9abd27cd31edf5068a0d976 100644 (file)
--- a/macosx/HBFilterController.h
+++ b/macosx/HBFilterController.h
@@ -25,15 +25,31 @@
 
     IBOutlet NSBox           * fPictureFilterBox;
 
+    IBOutlet NSBox           * fDetelecineBox;
+    IBOutlet NSPopUpButton   * fDetelecinePopUp;
+    IBOutlet NSTextField     * fDetelecineField;
+    
+    IBOutlet NSBox           * fDecombDeinterlaceBox;
+    IBOutlet NSSlider        * fDecombDeinterlaceSlider;
+    
+    IBOutlet NSBox           * fDecombBox;
+    IBOutlet NSPopUpButton   * fDecombPopUp;
+    IBOutlet NSTextField     * fDecombField;
+    
+    IBOutlet NSBox           * fDeinterlaceBox;
     IBOutlet NSPopUpButton   * fDeinterlacePopUp;
-    IBOutlet NSButton        * fDecombCheck;
-       IBOutlet NSButton        * fDetelecineCheck;
+    IBOutlet NSTextField     * fDeinterlaceField;
+
+    IBOutlet NSBox           * fDenoiseBox;
+    IBOutlet NSPopUpButton   * fDenoisePopUp;
+    IBOutlet NSTextField     * fDenoiseField;
+       
     IBOutlet NSButton        * fDeblockCheck;
     IBOutlet NSTextField     * fDeblockField;
     IBOutlet NSSlider        * fDeblockSlider;
-       IBOutlet NSPopUpButton   * fDenoisePopUp;
-       IBOutlet NSPopUpButton   * fAnamorphicPopUp;
-    IBOutlet NSSlider        * fPictureSlider;
+    
+    IBOutlet NSButton        * fGrayscaleCheck;
+
     IBOutlet NSTextField     * fInfoField;
        
     IBOutlet NSButton        * fPreviewOpenButton;
@@ -41,24 +57,20 @@
         
     int     MaxOutputWidth;
     int     MaxOutputHeight;
-    BOOL    autoCrop;
-    BOOL    allowLooseAnamorphic;
     
     int output_width, output_height, output_par_width, output_par_height;
     int display_width;
     
-    /* used to track the previous state of the keep aspect
-    ratio checkbox when turning anamorphic on, so it can be
-    returned to the previous state when anamorphic is turned
-    off */
-    BOOL    keepAspectRatioPreviousState; 
+ 
     
     struct {
         int     detelecine;
         int     deinterlace;
         int     decomb;
+        int     usedecomb;
         int     denoise;
         int     deblock;
+        int     grayscale;
     } fPictureFilterSettings;
 
 
@@ -72,29 +84,33 @@
 - (IBAction) showPreviewWindow: (id)sender;
 
 - (void) setInitialPictureFilters;
-
+- (IBAction) modeDecombDeinterlaceSliderChanged: (id) sender;
 
 - (IBAction) FilterSettingsChanged: (id) sender;
+- (void) adjustFilterDisplay: (id) sender;
 
 
-
-- (BOOL) autoCrop;
-- (void) setAutoCrop: (BOOL) setting;
-
-- (BOOL) allowLooseAnamorphic;
-- (void) setAllowLooseAnamorphic: (BOOL) setting;
 - (IBAction) deblockSliderChanged: (id) sender;
 - (int) detelecine;
+- (NSString*) detelecineCustomString;
 - (void) setDetelecine: (int) setting;
+- (int) useDecomb;
+- (void) setUseDecomb: (int) setting;
 - (int) deinterlace;
+- (NSString*) deinterlaceCustomString;
 - (void) setDeinterlace: (int) setting;
 - (int) decomb;
+- (NSString*) decombCustomString;
 - (void) setDecomb: (int) setting;
 - (int) denoise;
+- (NSString*) denoiseCustomString;
 - (void) setDenoise: (int) setting;
 - (int) deblock;
 - (void) setDeblock: (int) setting;
 
+- (int) grayscale;
+- (void) setGrayscale: (int) setting;
+
 - (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title;
 - (IBAction) showPictureSettingsWindow: (id)sender;
 

diff --git a/macosx/HBFilterController.mm b/macosx/HBFilterController.mm
index 24afa987c1ce8e7345bb31624aae591e48836431..83f73582351ccb8d8bb2b480040d0cf41a0c045d 100644 (file)
--- a/macosx/HBFilterController.mm
+++ b/macosx/HBFilterController.mm
@@ -99,6 +99,7 @@
     [[self window] setExcludedFromWindowsMenu:YES];
     
     [self setInitialPictureFilters];
+
 }
 
 
@@ -133,12 +134,28 @@
 are maintained across different sources */
 - (void) setInitialPictureFilters
 {
-       /* we use a popup to show the deinterlace settings */
+       /* we use a popup to show the detelecine settings */
+       [fDetelecinePopUp removeAllItems];
+    [fDetelecinePopUp addItemWithTitle: @"Off"];
+    [fDetelecinePopUp addItemWithTitle: @"Default"];
+    [fDetelecinePopUp addItemWithTitle: @"Custom"];
+    [fDetelecinePopUp selectItemAtIndex: fPictureFilterSettings.detelecine];
+    
+    [self modeDecombDeinterlaceSliderChanged:nil];
+    /* we use a popup to show the decomb settings */
+       [fDecombPopUp removeAllItems];
+    [fDecombPopUp addItemWithTitle: @"Off"];
+    [fDecombPopUp addItemWithTitle: @"Default"];
+    [fDecombPopUp addItemWithTitle: @"Custom"];
+    [fDecombPopUp selectItemAtIndex: fPictureFilterSettings.decomb];
+    
+    /* we use a popup to show the deinterlace settings */
        [fDeinterlacePopUp removeAllItems];
     [fDeinterlacePopUp addItemWithTitle: @"None"];
     [fDeinterlacePopUp addItemWithTitle: @"Fast"];
     [fDeinterlacePopUp addItemWithTitle: @"Slow"];
        [fDeinterlacePopUp addItemWithTitle: @"Slower"];
+    [fDeinterlacePopUp addItemWithTitle: @"Custom"];
     
        /* Set deinterlaces level according to the integer in the main window */
        [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
@@ -149,6 +166,7 @@ are maintained across different sources */
     [fDenoisePopUp addItemWithTitle: @"Weak"];
        [fDenoisePopUp addItemWithTitle: @"Medium"];
     [fDenoisePopUp addItemWithTitle: @"Strong"];
+    [fDenoisePopUp addItemWithTitle: @"Custom"];
        /* Set denoises level according to the integer in the main window */
        [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
     
@@ -158,11 +176,12 @@ are maintained across different sources */
 - (void) SetTitle: (hb_title_t *) title
 {
     /* Set filters widgets according to the filters struct */
-       [fDetelecineCheck setState:fPictureFilterSettings.detelecine];
+    [fDetelecinePopUp selectItemAtIndex:fPictureFilterSettings.detelecine];
+    [fDecombPopUp selectItemAtIndex:fPictureFilterSettings.decomb];
     [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
     [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
     [fDeblockSlider setFloatValue:fPictureFilterSettings.deblock];
-    [fDecombCheck setState:fPictureFilterSettings.decomb];
+    [fGrayscaleCheck setState:fPictureFilterSettings.grayscale];
     
     [self deblockSliderChanged: nil];
 }
@@ -180,13 +199,45 @@ are maintained across different sources */
        [self FilterSettingsChanged: sender];
 }
 
+
+- (IBAction) modeDecombDeinterlaceSliderChanged: (id) sender
+{
+    /* Decomb selected*/
+    if ([fDecombDeinterlaceSlider floatValue] == 0.0)
+    {
+    [fDecombBox setHidden:NO];
+    [fDeinterlaceBox setHidden:YES];
+    fPictureFilterSettings.decomb = [fDecombPopUp indexOfSelectedItem];
+    fPictureFilterSettings.usedecomb = 1;
+    fPictureFilterSettings.deinterlace = 0;
+    [self adjustFilterDisplay:fDecombPopUp];
+    [fDecombPopUp selectItemAtIndex:fPictureFilterSettings.decomb];
+    }
+    else
+    {
+    [fDecombBox setHidden:YES];
+    [fDeinterlaceBox setHidden:NO];
+    fPictureFilterSettings.usedecomb = 0;
+    fPictureFilterSettings.decomb = 0;
+    [self adjustFilterDisplay:fDeinterlacePopUp];
+    [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
+    }
+       [self FilterSettingsChanged: sender];
+}
+
 - (IBAction) FilterSettingsChanged: (id) sender
 {
-    fPictureFilterSettings.deinterlace = [fDeinterlacePopUp indexOfSelectedItem];
+    fPictureFilterSettings.detelecine  = [fDetelecinePopUp indexOfSelectedItem];
+    [self adjustFilterDisplay:fDetelecinePopUp];
     
-    fPictureFilterSettings.denoise     = [fDenoisePopUp indexOfSelectedItem];
+    fPictureFilterSettings.decomb = [fDecombPopUp indexOfSelectedItem];
+    [self adjustFilterDisplay:fDecombPopUp];
     
-    fPictureFilterSettings.detelecine  = [fDetelecineCheck state];
+    fPictureFilterSettings.deinterlace = [fDeinterlacePopUp indexOfSelectedItem];
+    [self adjustFilterDisplay:fDeinterlacePopUp];
+    
+    fPictureFilterSettings.denoise = [fDenoisePopUp indexOfSelectedItem];
+    [self adjustFilterDisplay:fDenoisePopUp];
     
     if ([fDeblockField stringValue] == @"Off")
     {
@@ -197,7 +248,7 @@ are maintained across different sources */
         fPictureFilterSettings.deblock  = [fDeblockField intValue];
     }
     
-    fPictureFilterSettings.decomb = [fDecombCheck state];
+    fPictureFilterSettings.grayscale = [fGrayscaleCheck state];
     
     if (sender != nil)
     {
@@ -207,32 +258,75 @@ are maintained across different sources */
 
 }
 
-
+- (void) adjustFilterDisplay: (id) sender
+{
+    
+    NSBox * filterBox;
+    NSTextField * filterField;
+    if (sender == fDetelecinePopUp)
+    {
+        filterBox = fDetelecineBox;
+        filterField = fDetelecineField;
+    }
+    if (sender == fDecombPopUp)
+    {
+        filterBox = fDecombBox;
+        filterField = fDecombField;
+    }
+    if (sender == fDeinterlacePopUp)
+    {
+        filterBox = fDeinterlaceBox;
+        filterField = fDeinterlaceField;
+    }
+    
+    if (sender == fDenoisePopUp)
+    {
+        filterBox = fDenoiseBox;
+        filterField = fDenoiseField;
+    }
+    
+    NSSize currentSize = [filterBox frame].size;
+    if ([sender titleOfSelectedItem] == @"Custom")
+    {
+        currentSize.height = 60;
+    }
+    else
+    {
+        currentSize.height = 30;
+    }
+    /* Check to see if we have changed the size from current */
+    if (currentSize.height != [filterBox frame].size.height)
+    {
+        /* We are changing the size of the box, so recalc the origin */
+        NSPoint origin = [filterBox frame].origin;
+        /* See if we are expanding the box downwards */
+        if (currentSize.height > [filterBox frame].size.height)
+        {
+            origin.y = origin.y - currentSize.height / 2;
+        }
+        else
+        {
+            origin.y = origin.y + currentSize.height;
+        }
+        /* go ahead and resize the box */
+        [filterBox setFrameSize:currentSize];
+        [filterBox setFrameOrigin:origin];
+    }
+    
+}
 
 #pragma mark -
 
-- (BOOL) autoCrop
-{
-    return autoCrop;
-}
-- (void) setAutoCrop: (BOOL) setting
-{
-    autoCrop = setting;
-}
 
-- (BOOL) allowLooseAnamorphic
-{
-    return allowLooseAnamorphic;
-}
 
-- (void) setAllowLooseAnamorphic: (BOOL) setting
+- (int) detelecine
 {
-    allowLooseAnamorphic = setting;
+    return fPictureFilterSettings.detelecine;
 }
 
-- (int) detelecine
+- (NSString*) detelecineCustomString
 {
-    return fPictureFilterSettings.detelecine;
+    return [fDetelecineField stringValue];
 }
 
 - (void) setDetelecine: (int) setting
@@ -244,8 +338,12 @@ are maintained across different sources */
 {
     return fPictureFilterSettings.deinterlace;
 }
-
-- (void) setDeinterlace: (int) setting {
+- (NSString*) deinterlaceCustomString
+{
+    return [fDeinterlaceField stringValue];
+}
+- (void) setDeinterlace: (int) setting 
+{
     fPictureFilterSettings.deinterlace = setting;
 }
 - (int) decomb
@@ -253,6 +351,21 @@ are maintained across different sources */
     return fPictureFilterSettings.decomb;
 }
 
+- (NSString*) decombCustomString
+{
+    return [fDecombField stringValue];
+}
+
+- (int) useDecomb
+{
+    return fPictureFilterSettings.usedecomb;
+}
+
+- (void) setUseDecomb: (int) setting
+{
+    fPictureFilterSettings.usedecomb = setting;
+}
+
 - (void) setDecomb: (int) setting {
     fPictureFilterSettings.decomb = setting;
 }
@@ -261,6 +374,11 @@ are maintained across different sources */
     return fPictureFilterSettings.denoise;
 }
 
+- (NSString*) denoiseCustomString
+{
+    return [fDenoiseField stringValue];
+}
+
 - (void) setDenoise: (int) setting
 {
     fPictureFilterSettings.denoise = setting;
@@ -276,6 +394,16 @@ are maintained across different sources */
     fPictureFilterSettings.deblock = setting;
 }
 
+- (int) grayscale
+{
+    return fPictureFilterSettings.grayscale;
+}
+
+- (void) setGrayscale: (int) setting
+{
+    fPictureFilterSettings.grayscale = setting;
+}
+
 - (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
 {
     [self SetTitle:title];

diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm
index 45d2f83a5e3e5615191f0d9007aabadacbf509bb..6874104c86279d741d3e98831778b44a7462f489 100644 (file)
--- a/macosx/HBQueueController.mm
+++ b/macosx/HBQueueController.mm
@@ -1044,34 +1044,53 @@ return ![(HBQueueOutlineView*)outlineView isDragging];
             pictureFiltersPresent = YES;
             pictureFilters = [pictureFilters stringByAppendingString:@" - VFR"];
         }
+        
         if( [[item objectForKey:@"PictureDetelecine"] intValue] == 1 )
         {
             pictureFiltersPresent = YES;
             pictureFilters = [pictureFilters stringByAppendingString:@" - Detelecine"];
         }
         
-        if( [[item objectForKey:@"PictureDecomb"] intValue] == 1)
+        if( [[item objectForKey:@"PictureDecombDeinterlace"] intValue] == 1)
         {
-            pictureFiltersPresent = YES;
-            pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb "];
-        }
-        
-        if ([[item objectForKey:@"PictureDeinterlace"] intValue] != 0)
-        {
-            pictureFiltersPresent = YES;
-            if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 1)
-            {
-                pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace: Fast "];
-            }
-            else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 2)
+            if ([[item objectForKey:@"PictureDecomb"] intValue] != 0)
             {
-                pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace: Slow "];           
+                pictureFiltersPresent = YES;
+                if( [[item objectForKey:@"PictureDecomb"] intValue] == 1)
+                {
+                    pictureFiltersPresent = YES;
+                    pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb Default "];
+                }
+                if( [[item objectForKey:@"PictureDecomb"] intValue] == 2)
+                {
+                    pictureFiltersPresent = YES;
+                    pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb Custom "];
+                }
             }
-            else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 3)
+        }
+        else
+        {
+            if ([[item objectForKey:@"PictureDeinterlace"] intValue] != 0)
             {
-                pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace: Slower "];            
+                pictureFiltersPresent = YES;
+                if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 1)
+                {
+                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace: Fast "];
+                }
+                else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 2)
+                {
+                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace: Slow "];           
+                }
+                else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 3)
+                {
+                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace: Slower "];            
+                }
+                else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 4)
+                {
+                    pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace: Custom "];            
+                }
+                
             }
-            
         }
         if ([[item objectForKey:@"PictureDenoise"] intValue] != 0)
         {
@@ -1088,6 +1107,10 @@ return ![(HBQueueOutlineView*)outlineView isDragging];
             {
                 pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise: Strong "];            
             }
+            else if ([[item objectForKey:@"PictureDenoise"] intValue] == 4)
+            {
+                pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise: Custom "];            
+            }
             
         }
         if ([[item objectForKey:@"PictureDeblock"] intValue] != 0)