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

1 files changed, 40 insertions, 17 deletions

diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm
index 45d2f83a5..6874104c8 100644
--- 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)