Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 12:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility to build on the last macOS 32 bit system with its last compatible Xcode (#2844)

Browse Source 
* Compatibility to build on the last macOS 32 bit system with its last compatible Xcode

* Code review: Compatibility declarations

* compatibility with `make`

* Code review: headers

* Avoiding dummy NSImageSymbolConfiguration implementation

* clang-format

* Don't force-include compat header

* Remove compat header from pch header

Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Mike Gelfand <mikedld@mikedld.com>
This commit is contained in:
Antoine Cœur
2022-04-25 04:34:30 +08:00
committed by GitHub
parent 07dc81170a
commit 7f9264940e
9 changed files with 101 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
macosx/PrefsController.mm
View File

@@ -18,6 +18,7 @@
#import "PortChecker.h"
#import "BonjourController.h"
#import "NSApplicationAdditions.h"
#import "NSImageAdditions.h"
#import "NSStringAdditions.h"
#define DOWNLOAD_FOLDER 0
@@ -296,14 +297,7 @@
if ([ident isEqualToString:TOOLBAR_GENERAL])
{
item.label = NSLocalizedString(@"General", "Preferences -> toolbar item title");
if (@available(macOS 11.0, *))
{
item.image = [NSImage imageWithSystemSymbolName:@"gearshape" accessibilityDescription:nil];
}
else
{
item.image = [NSImage imageNamed:NSImageNamePreferencesGeneral];
}
item.image = [NSImage systemSymbol:@"gearshape" withFallback:NSImageNamePreferencesGeneral];
item.target = self;
item.action = @selector(setPrefView:);
item.autovalidates = NO;
@@ -311,14 +305,7 @@
else if ([ident isEqualToString:TOOLBAR_TRANSFERS])
{
item.label = NSLocalizedString(@"Transfers", "Preferences -> toolbar item title");
if (@available(macOS 11.0, *))
{
item.image = [NSImage imageWithSystemSymbolName:@"arrow.up.arrow.down" accessibilityDescription:nil];
}
else
{
item.image = [NSImage imageNamed:@"Transfers"];
}
item.image = [NSImage systemSymbol:@"arrow.up.arrow.down" withFallback:@"Transfers"];
item.target = self;
item.action = @selector(setPrefView:);
item.autovalidates = NO;
@@ -326,14 +313,7 @@
else if ([ident isEqualToString:TOOLBAR_GROUPS])
{
item.label = NSLocalizedString(@"Groups", "Preferences -> toolbar item title");
if (@available(macOS 11.0, *))
{
item.image = [NSImage imageWithSystemSymbolName:@"pin" accessibilityDescription:nil];
}
else
{
item.image = [NSImage imageNamed:@"Groups"];
}
item.image = [NSImage systemSymbol:@"pin" withFallback:@"Groups"];
item.target = self;
item.action = @selector(setPrefView:);
item.autovalidates = NO;
@@ -341,14 +321,7 @@
else if ([ident isEqualToString:TOOLBAR_BANDWIDTH])
{
item.label = NSLocalizedString(@"Bandwidth", "Preferences -> toolbar item title");
if (@available(macOS 11.0, *))
{
item.image = [NSImage imageWithSystemSymbolName:@"speedometer" accessibilityDescription:nil];
}
else
{
item.image = [NSImage imageNamed:@"Bandwidth"];
}
item.image = [NSImage systemSymbol:@"speedometer" withFallback:@"Bandwidth"];
item.target = self;
item.action = @selector(setPrefView:);
item.autovalidates = NO;
@@ -356,14 +329,7 @@
else if ([ident isEqualToString:TOOLBAR_PEERS])
{
item.label = NSLocalizedString(@"Peers", "Preferences -> toolbar item title");
if (@available(macOS 11.0, *))
{
item.image = [NSImage imageWithSystemSymbolName:@"person.2" accessibilityDescription:nil];
}
else
{
item.image = [NSImage imageNamed:NSImageNameUserGroup];
}
item.image = [NSImage systemSymbol:@"person.2" withFallback:NSImageNameUserGroup];
item.target = self;
item.action = @selector(setPrefView:);
item.autovalidates = NO;
@@ -371,14 +337,7 @@
else if ([ident isEqualToString:TOOLBAR_NETWORK])
{
item.label = NSLocalizedString(@"Network", "Preferences -> toolbar item title");
if (@available(macOS 11.0, *))
{
item.image = [NSImage imageWithSystemSymbolName:@"network" accessibilityDescription:nil];
}
else
{
item.image = [NSImage imageNamed:NSImageNameNetwork];
}
item.image = [NSImage systemSymbol:@"network" withFallback:NSImageNameNetwork];
item.target = self;
item.action = @selector(setPrefView:);
item.autovalidates = NO;
@@ -386,14 +345,7 @@
else if ([ident isEqualToString:TOOLBAR_REMOTE])
{
item.label = NSLocalizedString(@"Remote", "Preferences -> toolbar item title");
if (@available(macOS 11.0, *))
{
item.image = [NSImage imageWithSystemSymbolName:@"antenna.radiowaves.left.and.right" accessibilityDescription:nil];
}
else
{
item.image = [NSImage imageNamed:@"Remote"];
}
item.image = [NSImage systemSymbol:@"antenna.radiowaves.left.and.right" withFallback:@"Remote"];
item.target = self;
item.action = @selector(setPrefView:);
item.autovalidates = NO;