diff options
| author | ritsuka <[email protected]> | 2015-01-10 08:33:07 +0000 |
|---|---|---|
| committer | ritsuka <[email protected]> | 2015-01-10 08:33:07 +0000 |
| commit | c15f3a20b256b97246ea6d63065d3374e0530f24 (patch) | |
| tree | 373ea46e3aaab24a6f2e3e03a74a348f61df857d | |
| parent | f73b7d7470a468bb58938066eaa48e3d8cdc573f (diff) | |
MacGui: remove HBViewValidation protocol.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6718 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | macosx/HBAdvancedController.h | 6 | ||||
| -rw-r--r-- | macosx/HBPresetsViewController.h | 5 | ||||
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/macosx/HBAdvancedController.h b/macosx/HBAdvancedController.h index 526b71c13..4e590b9c6 100644 --- 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 f2ab9dc19..6dab68f1c 100644 --- 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 e5e26d054..6668729b4 100644 --- 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 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; }; A91C02501A165EA200DEA6F3 /* EncodeComplete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeComplete.png; sourceTree = "<group>"; }; A91C02511A165EA200DEA6F3 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; 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; }; |