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, 0 insertions, 20 deletions

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 856caa101..690e8b95b 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -33,7 +33,6 @@
 		A22C85EC0D05D35000C10E36 /* HBPresets.h in Headers */ = {isa = PBXBuildFile; fileRef = A22C85EA0D05D35000C10E36 /* HBPresets.h */; };
 		A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */ = {isa = PBXBuildFile; fileRef = A22C85EB0D05D35000C10E36 /* HBPresets.m */; };
 		A25962E10F15077500B3BF4E /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A25962E00F15077500B3BF4E /* Quartz.framework */; };
-		A266019A0F2A1DC0007EA355 /* PictureFilters.xib in Resources */ = {isa = PBXBuildFile; fileRef = A26601980F2A1DC0007EA355 /* PictureFilters.xib */; };
 		A273E0510C57B39A00493A45 /* Pause.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04A0C57B39A00493A45 /* Pause.tiff */; };
 		A273E0520C57B39A00493A45 /* Play.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04B0C57B39A00493A45 /* Play.tiff */; };
 		A273E0530C57B39A00493A45 /* Stop.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04C0C57B39A00493A45 /* Stop.tiff */; };
@@ -44,8 +43,6 @@
 		A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1EC390C76C58400827E0D /* HBDVDDetector.m */; };
 		A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */; };
 		A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */; };
-		A2BF08050EFAB5D400C0E025 /* HBFilterController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BF08030EFAB5D400C0E025 /* HBFilterController.h */; };
-		A2BF08060EFAB5D400C0E025 /* HBFilterController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2BF08040EFAB5D400C0E025 /* HBFilterController.mm */; };
 		A2D0A0AB0D3E5929002D57CB /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; };
 		A2D0A0BF0D3E596F002D57CB /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; };
 		A2D7AD670C998AD30082CA33 /* ActivityWindow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */; };
@@ -156,7 +153,6 @@
 		A22C85EA0D05D35000C10E36 /* HBPresets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPresets.h; sourceTree = "<group>"; };
 		A22C85EB0D05D35000C10E36 /* HBPresets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresets.m; sourceTree = "<group>"; };
 		A25962E00F15077500B3BF4E /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; };
-		A26601990F2A1DC0007EA355 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PictureFilters.xib; sourceTree = "<group>"; };
 		A273E04A0C57B39A00493A45 /* Pause.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Pause.tiff; sourceTree = "<group>"; };
 		A273E04B0C57B39A00493A45 /* Play.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Play.tiff; sourceTree = "<group>"; };
 		A273E04C0C57B39A00493A45 /* Stop.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Stop.tiff; sourceTree = "<group>"; };
@@ -166,8 +162,6 @@
 		A2A1EC390C76C58400827E0D /* HBDVDDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBDVDDetector.m; sourceTree = "<group>"; };
 		A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; };
 		A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = "<group>"; };
-		A2BF08030EFAB5D400C0E025 /* HBFilterController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBFilterController.h; sourceTree = "<group>"; };
-		A2BF08040EFAB5D400C0E025 /* HBFilterController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HBFilterController.mm; sourceTree = "<group>"; };
 		A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = ActivityWindow.tiff; sourceTree = "<group>"; };
 		A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = AddToQueue.tiff; sourceTree = "<group>"; };
@@ -259,7 +253,6 @@
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
-				A26601980F2A1DC0007EA355 /* PictureFilters.xib */,
 			);
 			name = HandBrake;
 			sourceTree = "<group>";
@@ -312,9 +305,7 @@
 		526FBC930B4CAA260064E04C /* HandBrake Sources */ = {
 			isa = PBXGroup;
 			children = (
-				A2BF08030EFAB5D400C0E025 /* HBFilterController.h */,
 				4DF3C8CC052889CD00A80101 /* Controller.mm */,
-				A2BF08040EFAB5D400C0E025 /* HBFilterController.mm */,
 				A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */,
 				A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */,
 				A22C85EA0D05D35000C10E36 /* HBPresets.h */,
@@ -399,7 +390,6 @@
 				A9AC41E00C918DB500DDF9B8 /* HBAdvancedController.h in Headers */,
 				E37172680C977D340072B384 /* HBImageAndTextCell.h in Headers */,
 				A22C85EC0D05D35000C10E36 /* HBPresets.h in Headers */,
-				A2BF08050EFAB5D400C0E025 /* HBFilterController.h in Headers */,
 				A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */,
 				278070240F5C261300699207 /* ChapterTitles.h in Headers */,
 			);
@@ -554,7 +544,6 @@
 				E39AA4EA0D32DC0B0007A415 /* AdvancedView.xib in Resources */,
 				E39AA4EB0D32DC0B0007A415 /* OutputPanel.xib in Resources */,
 				A27BB4EA0EFAB9310027CDF9 /* PicturePreview.xib in Resources */,
-				A266019A0F2A1DC0007EA355 /* PictureFilters.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -587,7 +576,6 @@
 				A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */,
 				E37172670C977D340072B384 /* HBImageAndTextCell.m in Sources */,
 				A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */,
-				A2BF08060EFAB5D400C0E025 /* HBFilterController.mm in Sources */,
 				A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -616,14 +604,6 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		A26601980F2A1DC0007EA355 /* PictureFilters.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A26601990F2A1DC0007EA355 /* English */,
-			);
-			name = PictureFilters.xib;
-			sourceTree = "<group>";
-		};
 		A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */ = {
 			isa = PBXVariantGroup;
 			children = (