MacGui: Put Picture Settings and Video Filters into one inspector.

- Separated in a tab view
- Move methods from PictureFilterController into PictureController
- NOTE: This layout, etc is not final as far as detail by any means, however ...  did not want to get too far out from svn due to the mods to xcode and the current development of the build system.

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

1 files changed, 1 insertions, 5 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index bbb24bf15..b3c425e53 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -11,7 +11,6 @@
 
 #import "ChapterTitles.h"
 #import "PictureController.h"
-#import "HBFilterController.h"
 #import "HBPreviewController.h"
 #import "HBQueueController.h"
 #import "HBAdvancedController.h"
@@ -19,7 +18,6 @@
 #import "HBPresets.h"
 
 @class HBOutputPanelController;
-@class PictureFilterController;
 
 /* We subclass NSView so that our drags show both the icon as well as PresetName columns */
 @interface HBPresetsOutlineView : NSOutlineView
@@ -47,8 +45,7 @@ BOOL                        fIsDragging;
     
     /* Picture Settings */
     PictureController            * fPictureController;
-    /* Picture Filters */
-    PictureFilterController      * fPictureFilterController;
+    
     /* Picture Preview */
     PreviewController            * fPreviewController;
     
@@ -299,7 +296,6 @@ BOOL                        fIsDragging;
 - (IBAction) showPicturePanel: (id) sender;
 - (void) picturePanelFullScreen;
 - (void) picturePanelWindowed;
-- (IBAction) showFiltersPanel: (id) sender;
 - (IBAction) showPreviewWindow: (id) sender;
 - (void)pictureSettingsDidChange;
 - (IBAction) calculatePictureSizing: (id) sender;