MacGui: set the minimum macOS version to 10.11

diff --git a/macosx/DockTextField.m b/macosx/DockTextField.m
index 04f39b8ce6baad864205009ef4db68d295905dd8..62a7e337d7bdcf9b55450e2be3e4b883311a7643 100644 (file)
--- a/macosx/DockTextField.m
+++ b/macosx/DockTextField.m
@@ -41,14 +41,7 @@
     shadow.shadowOffset = NSMakeSize(2, -2);
     shadow.shadowBlurRadius = 6;
 
-    NSFont *font;
-    if ([[NSFont class] respondsToSelector:@selector(monospacedDigitSystemFontOfSize:weight:)]) {
-        // On macOS 10.11+ the monospaced digit system is available.
-        font = [NSFont monospacedDigitSystemFontOfSize:fontSize weight:NSFontWeightBold];
-    } else {
-        // macOS 10.10- use the default system font.
-        font = [NSFont boldSystemFontOfSize:fontSize];
-    }
+    NSFont *font = [NSFont monospacedDigitSystemFontOfSize:fontSize weight:NSFontWeightBold];
 
     return @{ NSForegroundColorAttributeName: [NSColor whiteColor],
               NSFontAttributeName: font,

diff --git a/macosx/HBController.m b/macosx/HBController.m
index b7d519bbedee68e53c5b8d26fa2b4bd8eaecfb58..15c9a43dae7ef885052f1d00f620fa68dfbf7a4d 100644 (file)
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -898,13 +898,9 @@ static void *HBControllerQueueCoreContext = &HBControllerQueueCoreContext;
                                                        isDirectory:YES];
        }
 
-    [panel setDirectoryURL:sourceDirectory];
-    [panel setAccessoryView:self.openTitleView];
-
-    if ([panel respondsToSelector:@selector(isAccessoryViewDisclosed)])
-    {
-        panel.accessoryViewDisclosed = YES;
-    }
+    panel.directoryURL = sourceDirectory;
+    panel.accessoryView = self.openTitleView;
+    panel.accessoryViewDisclosed = YES;
 
     [panel beginSheetModalForWindow:self.window completionHandler: ^(NSInteger result)
     {

diff --git a/macosx/HBPlayerHUDController.m b/macosx/HBPlayerHUDController.m
index ab459aea80daae7414ab78ef9452efa9bc64e7c3..05040c417d60c93f49f994390bdc50b7d083d8a0 100644 (file)
--- a/macosx/HBPlayerHUDController.m
+++ b/macosx/HBPlayerHUDController.m
@@ -43,13 +43,8 @@
 {
     [super viewDidLoad];
 
-    if ([[NSFont class] respondsToSelector:@selector(monospacedDigitSystemFontOfSize:weight:)]) {
-        _normalMonospacedAttr = @{NSFontAttributeName: [NSFont monospacedDigitSystemFontOfSize:15 weight:NSFontWeightRegular]};
-        _monospacedAttr = @{NSFontAttributeName: [NSFont monospacedDigitSystemFontOfSize:[NSFont smallSystemFontSize] weight:NSFontWeightRegular]};
-    }
-    else {
-        _monospacedAttr = @{NSFontAttributeName: [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]};
-    }
+    _normalMonospacedAttr = @{NSFontAttributeName: [NSFont monospacedDigitSystemFontOfSize:15 weight:NSFontWeightRegular]};
+    _monospacedAttr = @{NSFontAttributeName: [NSFont monospacedDigitSystemFontOfSize:[NSFont smallSystemFontSize] weight:NSFontWeightRegular]};
 }
 
 - (BOOL)canBeHidden

diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index 3f66bd71792ab80508f1be276d2d008948316220..4a00fd8ea7bf8117087070d02db7d5736e126a73 100644 (file)
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -293,10 +293,7 @@
             view.hidden = YES;
 
             [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
-                if ([context respondsToSelector:@selector(setAllowsImplicitAnimation:)])
-                {
-                    context.allowsImplicitAnimation = YES;
-                }
+                context.allowsImplicitAnimation = YES;
                 [window layoutIfNeeded];
 
             } completionHandler:^{

diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m
index fc2e5108f64f13c989b9859327ea621a3f670be6..9051ef9e13a6785ec787c403f88c6e0f1a3a3cda 100644 (file)
--- a/macosx/HBQueueController.m
+++ b/macosx/HBQueueController.m
@@ -649,10 +649,7 @@ static void *HBControllerQueueCoreContext = &HBControllerQueueCoreContext;
 
         if (volumeURL)
         {
-            if ([volumeURL respondsToSelector:@selector(removeCachedResourceValueForKey:)])
-            {
-                [volumeURL removeCachedResourceValueForKey:NSURLVolumeAvailableCapacityKey];
-            }
+            [volumeURL removeCachedResourceValueForKey:NSURLVolumeAvailableCapacityKey];
             attrs = [volumeURL resourceValuesForKeys:@[NSURLVolumeAvailableCapacityKey] error:NULL];
 
             if (attrs[NSURLVolumeAvailableCapacityKey])

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index abc11e5afcc8aa403695903c9152740fa7b87c92..b70911fe34fb9504c0db05a6d167aea81bf3b079 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -204,7 +204,6 @@
                A957EBCD218DBE5900007988 /* HBAutoNamer.m in Sources */ = {isa = PBXBuildFile; fileRef = A957EBCC218DBE5900007988 /* HBAutoNamer.m */; };
                A95BC1E71CD2548A008D6A33 /* volHighTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A95BC1E51CD2548A008D6A33 /* volHighTemplate.pdf */; };
                A95BC1E81CD2548A008D6A33 /* volLowTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A95BC1E61CD2548A008D6A33 /* volLowTemplate.pdf */; };
-               A9637D8A20F7A252001EAE7C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A9637D8820F7A252001EAE7C /* InfoPlist.strings */; };
                A96664B01CCE45BF00DA4A57 /* HBPlayerHUDController.m in Sources */ = {isa = PBXBuildFile; fileRef = A96664AE1CCE45BF00DA4A57 /* HBPlayerHUDController.m */; };
                A96664B51CCE48F700DA4A57 /* HBPictureHUDController.m in Sources */ = {isa = PBXBuildFile; fileRef = A96664B31CCE48F700DA4A57 /* HBPictureHUDController.m */; };
                A96664BA1CCE493D00DA4A57 /* HBEncodingProgressHUDController.m in Sources */ = {isa = PBXBuildFile; fileRef = A96664B81CCE493D00DA4A57 /* HBEncodingProgressHUDController.m */; };
@@ -513,7 +512,6 @@
                A95BC1E51CD2548A008D6A33 /* volHighTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = volHighTemplate.pdf; sourceTree = "<group>"; };
                A95BC1E61CD2548A008D6A33 /* volLowTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = volLowTemplate.pdf; sourceTree = "<group>"; };
                A95CB2FB217B6D07001E9F51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-               A9637D8920F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                A9637D9120F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HBEncodingProgressHUDController.strings; sourceTree = "<group>"; };
                A9637D9220F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HBTitleSelection.strings; sourceTree = "<group>"; };
                A9637D9320F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Presets.strings; sourceTree = "<group>"; };
@@ -1185,7 +1183,6 @@
                                A9DF49261C884C4E008AC14A /* HBPresetsTests.m */,
                                A94A98F41C858EFB004BA9BA /* HBDictTests.m */,
                                A9736F141C7DA5FE008F1D18 /* Info.plist */,
-                               A9637D8820F7A252001EAE7C /* InfoPlist.strings */,
                        );
                        path = HandBrakeKitTests;
                        sourceTree = "<group>";
@@ -1634,7 +1631,6 @@
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               A9637D8A20F7A252001EAE7C /* InfoPlist.strings in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -1874,14 +1870,6 @@
                        name = MainWindow.xib;
                        sourceTree = "<group>";
                };
-               A9637D8820F7A252001EAE7C /* InfoPlist.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               A9637D8920F7A252001EAE7C /* de */,
-                       );
-                       name = InfoPlist.strings;
-                       sourceTree = "<group>";
-               };
                A975B02020F7AF29004675CC /* Localizable.strings */ = {
                        isa = PBXVariantGroup;
                        children = (
@@ -2168,7 +2156,7 @@
                                        CFLocalizedString,
                                        HBKitLocalizedString,
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 10.10;
+                               MACOSX_DEPLOYMENT_TARGET = 10.11;
                                OTHER_LDFLAGS = (
                                        "-filelist",
                                        "$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",
@@ -2237,7 +2225,7 @@
                                        CFLocalizedString,
                                        HBKitLocalizedString,
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 10.10;
+                               MACOSX_DEPLOYMENT_TARGET = 10.11;
                                OTHER_LDFLAGS = (
                                        "-filelist",
                                        "$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",
@@ -2690,7 +2678,7 @@
                                        CFLocalizedString,
                                        HBKitLocalizedString,
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 10.10;
+                               MACOSX_DEPLOYMENT_TARGET = 10.11;
                                OTHER_LDFLAGS = (
                                        "-filelist",
                                        "$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",
@@ -2941,7 +2929,7 @@
                                        CFLocalizedString,
                                        HBKitLocalizedString,
                                );
-                               MACOSX_DEPLOYMENT_TARGET = 10.10;
+                               MACOSX_DEPLOYMENT_TARGET = 10.11;
                                OTHER_LDFLAGS = (
                                        "-filelist",
                                        "$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",

diff --git a/macosx/xcconfig/base/os.osx1011.xcconfig b/macosx/xcconfig/base/os.osx1011.xcconfig
new file mode 100644 (file)
index 0000000..e6a6a4e
--- /dev/null
+++ b/macosx/xcconfig/base/os.osx1011.xcconfig
@@ -0,0 +1 @@
+MACOSX_DEPLOYMENT_TARGET = 10.10

diff --git a/macosx/xcconfig/osx1011.x86_64.xcconfig b/macosx/xcconfig/osx1011.x86_64.xcconfig
new file mode 100644 (file)
index 0000000..fba1b27
--- /dev/null
+++ b/macosx/xcconfig/osx1011.x86_64.xcconfig
@@ -0,0 +1,3 @@
+#include "base/os.osx1011.xcconfig"
+#include "base/arch.x86_64.xcconfig"
+EXTERNAL_XCCONFIG = osx1011.x86_64

diff --git a/make/variant/darwin.defs b/make/variant/darwin.defs
index 1e06fb7ade265041ccd678186df226f02459d614..ec17f9e5f6d8c87454692b0045123e5255c42a94 100644 (file)
--- a/make/variant/darwin.defs
+++ b/make/variant/darwin.defs
@@ -1,4 +1,4 @@
-UB.xcconfigs = osx1010.i386 osx1010.x86_64
+UB.xcconfigs = osx1011.x86_64
 UB.builds    = $(wildcard $(foreach n,$(UB.xcconfigs),$(SRC/)build.$n))
 UB.first     = $(word 1,$(UB.xcconfigs))
 UB.more      = $(wordlist 2,999,$(UB.xcconfigs))