MacGui: Remove custome decomb option from preferences and Picture Settings

- Remove the text field to enter  a custom decomb string in the Preferences > Picture window
- Change the NSPopup for decomb to a checkbox in Picture Settings.

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

1 files changed, 2 insertions, 8 deletions

diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index 7ba284f83..c0f5771af 100644
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -161,6 +161,7 @@
     [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
     [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
     [fDeblockCheck setState: fPictureFilterSettings.deblock];
+    [fDecombCheck setState: fPictureFilterSettings.decomb];
     
     fPicture = 0;
     MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
@@ -191,13 +192,6 @@ are maintained across different sources */
 	/* Set denoises level according to the integer in the main window */
 	[fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
     
-    /* we use a popup to show the decomb settings */
-	[fDecombPopUp removeAllItems];
-    [fDecombPopUp addItemWithTitle: @"None"];
-    [fDecombPopUp addItemWithTitle: @"Default"];
-    [fDecombPopUp addItemWithTitle: @"Custom"];
-	/* Set denoises level according to the integer in the main window */
-	[fDecombPopUp selectItemAtIndex: fPictureFilterSettings.decomb];
 
 }
 
@@ -417,7 +411,7 @@ are maintained across different sources */
     fPictureFilterSettings.deblock  = [fDeblockField intValue];
     }
     
-    fPictureFilterSettings.decomb = [fDecombPopUp indexOfSelectedItem];
+    fPictureFilterSettings.decomb = [fDecombCheck state];
 
     if( job->keep_ratio )
     {