MacGui: renamed HB*Settings classes to HB*Defaults. Added a “…” char to the “Configure Defaults” button.

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

16 files changed, 67 insertions, 69 deletions

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 97e5f08db..6a719859c 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -17,7 +17,7 @@
 
 #import "HBPresetsViewController.h"
 
-#import "HBAudioSettings.h"
+#import "HBAudioDefaults.h"
 
 NSString *HBContainerChangedNotification       = @"HBContainerChangedNotification";
 NSString *keyContainerTag                      = @"keyContainerTag";
diff --git a/macosx/English.lproj/Audio.xib b/macosx/English.lproj/Audio.xib
index 6b6c1937c..fc0954fdf 100644
--- a/macosx/English.lproj/Audio.xib
+++ b/macosx/English.lproj/Audio.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment version="1060" defaultVersion="1090" identifier="macosx"/>
+        <deployment version="1060" defaultVersion="1060" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
     </dependencies>
     <objects>
@@ -293,9 +293,9 @@
                     </tableHeaderView>
                 </scrollView>
                 <button appearanceType="aqua" verticalHuggingPriority="750" id="vFP-nq-IQg">
-                    <rect key="frame" x="113" y="288" width="130" height="28"/>
+                    <rect key="frame" x="110" y="288" width="140" height="28"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="push" title="Configure Defaults" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aYF-d5-Ya6">
+                    <buttonCell key="cell" type="push" title="Configure Defaults…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aYF-d5-Ya6">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
                     </buttonCell>
@@ -304,7 +304,7 @@
                     </connections>
                 </button>
                 <button appearanceType="aqua" verticalHuggingPriority="750" id="wcL-rL-aYS">
-                    <rect key="frame" x="241" y="288" width="116" height="28"/>
+                    <rect key="frame" x="248" y="288" width="116" height="28"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="push" title="Reload Defaults" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="q2P-Tg-cBJ">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
diff --git a/macosx/English.lproj/AudioDefaults.xib b/macosx/English.lproj/AudioDefaults.xib
index 1775ae7ff..4bd72a4ff 100644
--- a/macosx/English.lproj/AudioDefaults.xib
+++ b/macosx/English.lproj/AudioDefaults.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1090" identifier="macosx"/>
+        <deployment defaultVersion="1060" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
     </dependencies>
     <objects>
@@ -459,8 +459,8 @@ DQ
                                             <sliderCell key="dataCell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="4" tickMarkPosition="below" numberOfTickMarks="16" allowsTickMarkValuesOnly="YES" sliderType="circular" id="say-2a-x5G"/>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <connections>
-                                                <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.passThruDisabled" id="q8u-5E-Adj"/>
                                                 <binding destination="I6S-EX-Dvu" name="value" keyPath="arrangedObjects.drc" id="3lI-ks-4a5"/>
+                                                <binding destination="I6S-EX-Dvu" name="enabled" keyPath="arrangedObjects.passThruDisabled" id="q8u-5E-Adj"/>
                                             </connections>
                                         </tableColumn>
                                         <tableColumn identifier="drctext" editable="NO" width="25" minWidth="10" maxWidth="3.4028229999999999e+38" id="eLM-kL-FjB">
diff --git a/macosx/English.lproj/Subtitles.xib b/macosx/English.lproj/Subtitles.xib
index c1ce2d18f..f9b14d067 100644
--- a/macosx/English.lproj/Subtitles.xib
+++ b/macosx/English.lproj/Subtitles.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment version="1060" defaultVersion="1090" identifier="macosx"/>
+        <deployment version="1060" defaultVersion="1060" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
     </dependencies>
     <objects>
@@ -184,9 +184,9 @@
                     </popUpButtonCell>
                 </popUpButton>
                 <button appearanceType="aqua" verticalHuggingPriority="750" id="QsM-28-Pya">
-                    <rect key="frame" x="113" y="288" width="130" height="28"/>
+                    <rect key="frame" x="110" y="288" width="140" height="28"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="push" title="Configure Defaults" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oxg-bs-1si">
+                    <buttonCell key="cell" type="push" title="Configure Defaults…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oxg-bs-1si">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
                     </buttonCell>
@@ -195,7 +195,7 @@
                     </connections>
                 </button>
                 <button appearanceType="aqua" verticalHuggingPriority="750" id="Vxx-gk-9kY">
-                    <rect key="frame" x="241" y="288" width="116" height="28"/>
+                    <rect key="frame" x="248" y="288" width="116" height="28"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="push" title="Reload Defaults" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jG8-uo-1tv">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
diff --git a/macosx/HBAudioController.h b/macosx/HBAudioController.h
index b77b3ad20..d6f475c29 100644
--- a/macosx/HBAudioController.h
+++ b/macosx/HBAudioController.h
@@ -19,7 +19,7 @@ extern NSString *keyAudioInputChannelLayout;
 extern NSString *HBMixdownChangedNotification;
 
 @class HBAudio;
-@class HBAudioSettings;
+@class HBAudioDefaults;
 /**
  *  HBAudioController
  *
@@ -30,7 +30,7 @@ extern NSString *HBMixdownChangedNotification;
 @property (nonatomic, readonly, retain) NSArray *masterTrackArray;
 @property (nonatomic, readonly) NSDictionary *noneTrack;
 
-@property(nonatomic, readonly) HBAudioSettings *settings;
+@property(nonatomic, readonly) HBAudioDefaults *settings;
 
 // Get the list of audio tracks
 @property (readonly, nonatomic, copy) NSArray *audioTracks;
diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m
index df623d877..1a5f7c47b 100644
--- a/macosx/HBAudioController.m
+++ b/macosx/HBAudioController.m
@@ -8,7 +8,7 @@
 #import "HBAudioController.h"
 #import "Controller.h"
 #import "HBAudio.h"
-#import "HBAudioSettings.h"
+#import "HBAudioDefaults.h"
 #import "HBAudioDefaultsController.h"
 #import "HBAudioTrackPreset.h"
 #import "hb.h"
@@ -44,7 +44,7 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
 
 // Defaults
 @property (nonatomic, readwrite, retain) HBAudioDefaultsController *defaultsController;
-@property (nonatomic, readwrite, retain) HBAudioSettings *settings;
+@property (nonatomic, readwrite, retain) HBAudioDefaults *settings;
 
 @end
 
@@ -199,7 +199,7 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
 
 - (void)applySettingsFromPreset:(NSDictionary *)preset
 {
-    self.settings = [[[HBAudioSettings alloc] init] autorelease];
+    self.settings = [[[HBAudioDefaults alloc] init] autorelease];
     [self.settings applySettingsFromPreset:preset];
     [self.settings validateEncoderFallbackForVideoContainer:[self.videoContainerTag intValue]];
 
diff --git a/macosx/HBAudioSettings.h b/macosx/HBAudioDefaults.h
index f0ee3ced6..5853a6e12 100644
--- a/macosx/HBAudioSettings.h
+++ b/macosx/HBAudioDefaults.h
@@ -1,10 +1,8 @@
-//
-//  HBAudioSettings.h
-//  HandBrake
-//
-//  Created by Damiano Galassi on 29/07/14.
-//
-//
+/*  HBAudioSettings.h $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
 
 #import <Foundation/Foundation.h>
 
@@ -18,7 +16,7 @@ typedef NS_ENUM(NSUInteger, HBAudioTrackSelectionBehavior) {
  *  HBAudioSettings
  *  Stores the audio defaults settings.
  */
-@interface HBAudioSettings : NSObject
+@interface HBAudioDefaults : NSObject
 
 @property (nonatomic, readwrite) HBAudioTrackSelectionBehavior trackSelectionBehavior;
 @property (nonatomic, readwrite, retain) NSMutableArray *trackSelectionLanguages;
diff --git a/macosx/HBAudioSettings.m b/macosx/HBAudioDefaults.m
index ba645cdf2..304849d79 100644
--- a/macosx/HBAudioSettings.m
+++ b/macosx/HBAudioDefaults.m
@@ -1,23 +1,21 @@
-//
-//  HBAudioSettings.m
-//  HandBrake
-//
-//  Created by Damiano Galassi on 29/07/14.
-//
-//
-
-#import "HBAudioSettings.h"
+/*  HBAudioSettings.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBAudioDefaults.h"
 #import "HBAudioTrackPreset.h"
 #import "hb.h"
 #import "lang.h"
 
-@interface HBAudioSettings ()
+@interface HBAudioDefaults ()
 
 @property (nonatomic, readwrite) int container;
 
 @end
 
-@implementation HBAudioSettings
+@implementation HBAudioDefaults
 
 - (instancetype)init
 {
diff --git a/macosx/HBAudioDefaultsController.h b/macosx/HBAudioDefaultsController.h
index c592ea6eb..fb5e87acb 100644
--- a/macosx/HBAudioDefaultsController.h
+++ b/macosx/HBAudioDefaultsController.h
@@ -6,11 +6,11 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class HBAudioSettings;
+@class HBAudioDefaults;
 
 @interface HBAudioDefaultsController : NSWindowController
 
-- (instancetype)initWithSettings:(HBAudioSettings *)settings;
+- (instancetype)initWithSettings:(HBAudioDefaults *)settings;
 
 @property (nonatomic, readwrite, assign) id delegate;
 
diff --git a/macosx/HBAudioDefaultsController.m b/macosx/HBAudioDefaultsController.m
index 2dfefc292..732601743 100644
--- a/macosx/HBAudioDefaultsController.m
+++ b/macosx/HBAudioDefaultsController.m
@@ -5,14 +5,14 @@
  It may be used under the terms of the GNU General Public License. */
 
 #import "HBAudioDefaultsController.h"
-#import "HBAudioSettings.h"
+#import "HBAudioDefaults.h"
 #import "HBLanguagesSelection.h"
 
 static void *HBAudioDefaultsContex = &HBAudioDefaultsContex;
 
 @interface HBAudioDefaultsController ()
 
-@property (nonatomic, readonly) HBAudioSettings *settings;
+@property (nonatomic, readonly) HBAudioDefaults *settings;
 
 @property (nonatomic, readonly) HBLanguagesSelection *languagesList;
 @property (assign) IBOutlet HBLanguageArrayController *tableController;
@@ -24,7 +24,7 @@ static void *HBAudioDefaultsContex = &HBAudioDefaultsContex;
 
 @implementation HBAudioDefaultsController
 
-- (instancetype)initWithSettings:(HBAudioSettings *)settings
+- (instancetype)initWithSettings:(HBAudioDefaults *)settings
 {
     self = [super initWithWindowNibName:@"AudioDefaults"];
     if (self)
diff --git a/macosx/HBSubtitlesController.m b/macosx/HBSubtitlesController.m
index 996105796..92cc1d1db 100644
--- a/macosx/HBSubtitlesController.m
+++ b/macosx/HBSubtitlesController.m
@@ -6,7 +6,7 @@
 
 #import "HBSubtitlesController.h"
 #import "HBSubtitlesDefaultsController.h"
-#import "HBSubtitlesSettings.h"
+#import "HBSubtitlesDefaults.h"
 
 #import "Controller.h"
 #include "hb.h"
@@ -51,7 +51,7 @@ NSString *keySubTrackLanguageIndex = @"keySubTrackLanguageIndex";
 
 // Defaults
 @property (nonatomic, readwrite, retain) HBSubtitlesDefaultsController *defaultsController;
-@property (nonatomic, readwrite, retain) HBSubtitlesSettings *settings;
+@property (nonatomic, readwrite, retain) HBSubtitlesDefaults *settings;
 
 // Table view cells models
 @property (nonatomic, readonly) NSArray *charCodeArray;
@@ -221,7 +221,7 @@ NSString *keySubTrackLanguageIndex = @"keySubTrackLanguageIndex";
 
 - (void)applySettingsFromPreset:(NSDictionary *)preset
 {
-    self.settings = [[[HBSubtitlesSettings alloc] init] autorelease];
+    self.settings = [[[HBSubtitlesDefaults alloc] init] autorelease];
     [self.settings applySettingsFromPreset:preset];
 
     [self addTracksFromDefaults:self];
diff --git a/macosx/HBSubtitlesSettings.h b/macosx/HBSubtitlesDefaults.h
index a2cda1fb8..21ebce5f2 100644
--- a/macosx/HBSubtitlesSettings.h
+++ b/macosx/HBSubtitlesDefaults.h
@@ -12,7 +12,7 @@ typedef NS_ENUM(NSUInteger, HBSubtitleTrackSelectionBehavior) {
     HBSubtitleTrackSelectionBehaviorAll,
 };
 
-@interface HBSubtitlesSettings : NSObject
+@interface HBSubtitlesDefaults : NSObject
 
 @property (nonatomic, readwrite) HBSubtitleTrackSelectionBehavior trackSelectionBehavior;
 @property (nonatomic, readwrite, retain) NSMutableArray *trackSelectionLanguages;
diff --git a/macosx/HBSubtitlesSettings.m b/macosx/HBSubtitlesDefaults.m
index d9015e319..6cd5b6782 100644
--- a/macosx/HBSubtitlesSettings.m
+++ b/macosx/HBSubtitlesDefaults.m
@@ -4,9 +4,9 @@
  Homepage: <http://handbrake.fr/>.
  It may be used under the terms of the GNU General Public License. */
 
-#import "HBSubtitlesSettings.h"
+#import "HBSubtitlesDefaults.h"
 
-@implementation HBSubtitlesSettings
+@implementation HBSubtitlesDefaults
 
 - (instancetype)init
 {
diff --git a/macosx/HBSubtitlesDefaultsController.h b/macosx/HBSubtitlesDefaultsController.h
index 12056a021..4f7c3c8bd 100644
--- a/macosx/HBSubtitlesDefaultsController.h
+++ b/macosx/HBSubtitlesDefaultsController.h
@@ -6,11 +6,11 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class HBSubtitlesSettings;
+@class HBSubtitlesDefaults;
 
 @interface HBSubtitlesDefaultsController : NSWindowController
 
-- (instancetype)initWithSettings:(HBSubtitlesSettings *)settings;
+- (instancetype)initWithSettings:(HBSubtitlesDefaults *)settings;
 
 @property (nonatomic, readwrite, assign) id delegate;
 
diff --git a/macosx/HBSubtitlesDefaultsController.m b/macosx/HBSubtitlesDefaultsController.m
index cef2be1d7..3c458abac 100644
--- a/macosx/HBSubtitlesDefaultsController.m
+++ b/macosx/HBSubtitlesDefaultsController.m
@@ -5,14 +5,14 @@
  It may be used under the terms of the GNU General Public License. */
 
 #import "HBSubtitlesDefaultsController.h"
-#import "HBSubtitlesSettings.h"
+#import "HBSubtitlesDefaults.h"
 #import "HBLanguagesSelection.h"
 
 static void *HBSubtitlesDefaultsContex = &HBSubtitlesDefaultsContex;
 
 @interface HBSubtitlesDefaultsController ()
 
-@property (nonatomic, readonly) HBSubtitlesSettings *settings;
+@property (nonatomic, readonly) HBSubtitlesDefaults *settings;
 
 @property (nonatomic, readonly) HBLanguagesSelection *languagesList;
 @property (assign) IBOutlet HBLanguageArrayController *tableController;
@@ -22,7 +22,7 @@ static void *HBSubtitlesDefaultsContex = &HBSubtitlesDefaultsContex;
 
 @implementation HBSubtitlesDefaultsController
 
-- (instancetype)initWithSettings:(HBSubtitlesSettings *)settings
+- (instancetype)initWithSettings:(HBSubtitlesDefaults *)settings
 {
     self = [super initWithWindowNibName:@"SubtitlesDefaults"];
     if (self)
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 2fb8e4606..e49b41683 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -120,7 +120,7 @@
 		A91726E7197291BC00D1AFEF /* HBChapterTitlesController.m in Sources */ = {isa = PBXBuildFile; fileRef = A91726E6197291BC00D1AFEF /* HBChapterTitlesController.m */; };
 		A932E26C1988334B0047D13E /* AudioDefaults.xib in Resources */ = {isa = PBXBuildFile; fileRef = A932E26A1988334B0047D13E /* AudioDefaults.xib */; };
 		A932E26F198833920047D13E /* HBAudioDefaultsController.m in Sources */ = {isa = PBXBuildFile; fileRef = A932E26E198833920047D13E /* HBAudioDefaultsController.m */; };
-		A932E273198834130047D13E /* HBAudioSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = A932E272198834130047D13E /* HBAudioSettings.m */; };
+		A932E273198834130047D13E /* HBAudioDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = A932E272198834130047D13E /* HBAudioDefaults.m */; };
 		A93E0ED31972957000FD67FB /* HBVideoController.m in Sources */ = {isa = PBXBuildFile; fileRef = A93E0ED11972957000FD67FB /* HBVideoController.m */; };
 		A93E0ED71972958C00FD67FB /* Video.xib in Resources */ = {isa = PBXBuildFile; fileRef = A93E0ED51972958C00FD67FB /* Video.xib */; };
 		A9523937199A6AAE00588AEF /* HBFilters.m in Sources */ = {isa = PBXBuildFile; fileRef = A9523936199A6AAE00588AEF /* HBFilters.m */; };
@@ -143,7 +143,7 @@
 		A9E1468316BC2AD800C307BC /* prev-p.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A9E1467F16BC2AD800C307BC /* prev-p.pdf */; };
 		A9F2EB6F196F12C800066546 /* Audio.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9F2EB6D196F12C800066546 /* Audio.xib */; };
 		A9F472891976B7F30009EC65 /* HBSubtitlesDefaultsController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F472871976B7F30009EC65 /* HBSubtitlesDefaultsController.m */; };
-		A9F4728D1976BAA70009EC65 /* HBSubtitlesSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F4728C1976BAA70009EC65 /* HBSubtitlesSettings.m */; };
+		A9F4728D1976BAA70009EC65 /* HBSubtitlesDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F4728C1976BAA70009EC65 /* HBSubtitlesDefaults.m */; };
 		A9F7102619A475EC00F61301 /* HBDockTile.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F7102519A475EC00F61301 /* HBDockTile.m */; };
 		D2BCB10916F5152C0084604C /* activity.png in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0F616F515230084604C /* activity.png */; };
 		D2BCB10A16F5152C0084604C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = D2BCB0F716F515230084604C /* [email protected] */; };
@@ -333,8 +333,8 @@
 		A932E26B1988334B0047D13E /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = AudioDefaults.xib; sourceTree = "<group>"; };
 		A932E26D198833920047D13E /* HBAudioDefaultsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioDefaultsController.h; sourceTree = "<group>"; };
 		A932E26E198833920047D13E /* HBAudioDefaultsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioDefaultsController.m; sourceTree = "<group>"; };
-		A932E271198834130047D13E /* HBAudioSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioSettings.h; sourceTree = "<group>"; };
-		A932E272198834130047D13E /* HBAudioSettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioSettings.m; sourceTree = "<group>"; };
+		A932E271198834130047D13E /* HBAudioDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioDefaults.h; sourceTree = "<group>"; };
+		A932E272198834130047D13E /* HBAudioDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioDefaults.m; sourceTree = "<group>"; };
 		A93E0ED01972957000FD67FB /* HBVideoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBVideoController.h; sourceTree = "<group>"; };
 		A93E0ED11972957000FD67FB /* HBVideoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBVideoController.m; sourceTree = "<group>"; };
 		A93E0ED61972958C00FD67FB /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Video.xib; sourceTree = "<group>"; };
@@ -371,8 +371,8 @@
 		A9F2EB6E196F12C800066546 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Audio.xib; sourceTree = "<group>"; };
 		A9F472861976B7F30009EC65 /* HBSubtitlesDefaultsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitlesDefaultsController.h; sourceTree = "<group>"; };
 		A9F472871976B7F30009EC65 /* HBSubtitlesDefaultsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitlesDefaultsController.m; sourceTree = "<group>"; };
-		A9F4728B1976BAA70009EC65 /* HBSubtitlesSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitlesSettings.h; sourceTree = "<group>"; };
-		A9F4728C1976BAA70009EC65 /* HBSubtitlesSettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitlesSettings.m; sourceTree = "<group>"; };
+		A9F4728B1976BAA70009EC65 /* HBSubtitlesDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitlesDefaults.h; sourceTree = "<group>"; };
+		A9F4728C1976BAA70009EC65 /* HBSubtitlesDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitlesDefaults.m; sourceTree = "<group>"; };
 		A9F7102419A475EC00F61301 /* HBDockTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBDockTile.h; sourceTree = "<group>"; };
 		A9F7102519A475EC00F61301 /* HBDockTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBDockTile.m; sourceTree = "<group>"; };
 		D2BCB0F616F515230084604C /* activity.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = activity.png; sourceTree = "<group>"; };
@@ -586,7 +586,7 @@
 			isa = PBXGroup;
 			children = (
 				A9B34D6F197683FE00871B7D /* Controllers */,
-				A98C29C51977C00000AF5DED /* Model */,
+				A98C29C51977C00000AF5DED /* Core */,
 				A952392E199A647F00588AEF /* Presets */,
 				A9AA447D1970729300D7DEFC /* HBPreviewGenerator.h */,
 				A9D1E41618262364002F6424 /* HBPreviewGenerator.m */,
@@ -776,13 +776,13 @@
 			name = Presets;
 			sourceTree = "<group>";
 		};
-		A98C29C51977C00000AF5DED /* Model */ = {
+		A98C29C51977C00000AF5DED /* Core */ = {
 			isa = PBXGroup;
 			children = (
-				A932E271198834130047D13E /* HBAudioSettings.h */,
-				A932E272198834130047D13E /* HBAudioSettings.m */,
-				A9F4728B1976BAA70009EC65 /* HBSubtitlesSettings.h */,
-				A9F4728C1976BAA70009EC65 /* HBSubtitlesSettings.m */,
+				A932E271198834130047D13E /* HBAudioDefaults.h */,
+				A932E272198834130047D13E /* HBAudioDefaults.m */,
+				A9F4728B1976BAA70009EC65 /* HBSubtitlesDefaults.h */,
+				A9F4728C1976BAA70009EC65 /* HBSubtitlesDefaults.m */,
 				273F209114ADBE670021BE6D /* HBAudio.h */,
 				273F209214ADBE670021BE6D /* HBAudio.m */,
 				A90A0CAD1988D57200DA65CE /* HBAudioTrackPreset.h */,
@@ -790,7 +790,7 @@
 				A9523935199A6AAE00588AEF /* HBFilters.h */,
 				A9523936199A6AAE00588AEF /* HBFilters.m */,
 			);
-			name = Model;
+			name = Core;
 			sourceTree = "<group>";
 		};
 		A9B34D6F197683FE00871B7D /* Controllers */ = {
@@ -1039,7 +1039,7 @@
 				A9F7102619A475EC00F61301 /* HBDockTile.m in Sources */,
 				A98C29C41977B10600AF5DED /* HBLanguagesSelection.m in Sources */,
 				A9BB0F2719A0ECE40079F1C1 /* HBHUDButtonCell.m in Sources */,
-				A932E273198834130047D13E /* HBAudioSettings.m in Sources */,
+				A932E273198834130047D13E /* HBAudioDefaults.m in Sources */,
 				A9523937199A6AAE00588AEF /* HBFilters.m in Sources */,
 				A9AA447A1970664A00D7DEFC /* HBUtilities.m in Sources */,
 				273F20AC14ADBE670021BE6D /* Controller.m in Sources */,
@@ -1054,7 +1054,7 @@
 				A9DC6C52196F04F6002AE6B4 /* HBSubtitlesController.m in Sources */,
 				A9F472891976B7F30009EC65 /* HBSubtitlesDefaultsController.m in Sources */,
 				A9CF25F41990D64E0023F727 /* HBPreset.m in Sources */,
-				A9F4728D1976BAA70009EC65 /* HBSubtitlesSettings.m in Sources */,
+				A9F4728D1976BAA70009EC65 /* HBSubtitlesDefaults.m in Sources */,
 				A93E0ED31972957000FD67FB /* HBVideoController.m in Sources */,
 				273F20B614ADBE670021BE6D /* HBPresetsManager.m in Sources */,
 				273F20B714ADBE670021BE6D /* HBPreviewController.m in Sources */,
@@ -1232,6 +1232,7 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_LDFLAGS = (
 					"-filelist",
 					"$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",
@@ -1260,6 +1261,7 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_LDFLAGS = (
 					"-filelist",
 					"$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",