MacGui: remove HBViewValidation protocol.

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

diff --git a/macosx/HBAdvancedController.h b/macosx/HBAdvancedController.h
index 526b71c13270bdff0cc3cb97e719b0d09ad42979..4e590b9c688562f1ecc431d6c0ac8307607fc30a 100644 (file)
--- a/macosx/HBAdvancedController.h
+++ b/macosx/HBAdvancedController.h
@@ -5,16 +5,16 @@
     It may be used under the terms of the GNU General Public License. */
 
 #import <Cocoa/Cocoa.h>
-#import "HBViewValidation.h"
 
 @class HBVideo;
 
 /**
  *  HBAdvancedController
  */
-@interface HBAdvancedController : NSViewController <HBViewValidation>
+@interface HBAdvancedController : NSViewController
 
 @property (nonatomic, readwrite, retain) HBVideo *videoSettings;
-@property (nonatomic, readwrite, getter=isHidden) BOOL hidden;
 
+@property (nonatomic, readwrite, getter=isHidden) BOOL hidden;
+@property (nonatomic, readwrite, getter=isEnabled) BOOL enabled;
 @end

diff --git a/macosx/HBPresetsViewController.h b/macosx/HBPresetsViewController.h
index f2ab9dc1988af5eb78f9bc64e616161e386e9394..6dab68f1c2f65f681a9dadedaabc968dc84bb824 100644 (file)
--- a/macosx/HBPresetsViewController.h
+++ b/macosx/HBPresetsViewController.h
@@ -5,7 +5,6 @@
  It may be used under the terms of the GNU General Public License. */
 
 #import <Cocoa/Cocoa.h>
-#import "HBViewValidation.h"
 
 @class HBPresetsManager;
 @class HBPreset;
@@ -17,7 +16,7 @@
 
 @end
 
-@interface HBPresetsViewController : NSViewController <HBViewValidation>
+@interface HBPresetsViewController : NSViewController
 
 - (instancetype)initWithPresetManager:(HBPresetsManager *)presetManager;
 
@@ -31,4 +30,6 @@
 @property (nonatomic, readonly) HBPreset *selectedPreset;
 @property (nonatomic, readonly) NSUInteger indexOfSelectedItem;
 
+@property (nonatomic, readwrite, getter=isEnabled) BOOL enabled;
+
 @end

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index e5e26d0540e475ec387b1a84a9e1f65afb9bb346..6668729b4e553fc5c10fcf39c7334b15c5ef2601 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -356,7 +356,6 @@
                A91726E6197291BC00D1AFEF /* HBChapterTitlesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBChapterTitlesController.m; sourceTree = "<group>"; };
                A918066F1A4807B000FC9BED /* HBRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBRange.h; sourceTree = "<group>"; };
                A91806701A4807B000FC9BED /* HBRange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBRange.m; sourceTree = "<group>"; };
-               A919C7AC199369180049E6A3 /* HBViewValidation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBViewValidation.h; sourceTree = "<group>"; };
                A91C024C1A16516A00DEA6F3 /* JobSmall@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "JobSmall@2x.png"; sourceTree = "<group>"; };
                A91C02501A165EA200DEA6F3 /* EncodeComplete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeComplete.png; sourceTree = "<group>"; };
                A91C02511A165EA200DEA6F3 /* EncodeComplete@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeComplete@2x.png"; sourceTree = "<group>"; };
@@ -956,7 +955,6 @@
                                A9F472851976B7AA0009EC65 /* Subtitles Defaults */,
                                A91726E5197291BC00D1AFEF /* HBChapterTitlesController.h */,
                                A91726E6197291BC00D1AFEF /* HBChapterTitlesController.m */,
-                               A919C7AC199369180049E6A3 /* HBViewValidation.h */,
                        );
                        name = "Main Window View Controllers";
                        sourceTree = "<group>";
@@ -1510,6 +1508,7 @@
                                        "\"$(EXTERNAL_BUILD)/libhb\"",
                                        "\"$(EXTERNAL_BUILD)/contrib/lib\"",
                                );
+                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                WRAPPER_EXTENSION = app;
                        };
@@ -1533,6 +1532,7 @@
                                        "\"$(EXTERNAL_BUILD)/libhb\"",
                                        "\"$(EXTERNAL_BUILD)/contrib/lib\"",
                                );
+                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                WRAPPER_EXTENSION = app;
                        };