diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 10763883e..0f93702c5 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -309,6 +309,28 @@ jobs: run: | if (Select-String -Path makelog -Pattern 'warning:') { exit 1 } + macos-14-project: + runs-on: macos-14 + needs: [ what-to-make ] + if: ${{ needs.what-to-make.outputs.make-cli == 'true' || needs.what-to-make.outputs.make-daemon == 'true' || needs.what-to-make.outputs.make-mac == 'true' || needs.what-to-make.outputs.make-utils == 'true' }} + steps: + - name: Show Configuration + run: | + echo '${{ toJSON(needs) }}' + echo '${{ toJSON(runner) }}' + sw_vers + - name: Get Source + uses: actions/checkout@v4 + with: + path: src + submodules: recursive + - name: Build + run: xcodebuild -project src/Transmission.xcodeproj + - uses: actions/upload-artifact@v4 + with: + name: binaries-${{ github.job }} + path: pfx/**/* + macos-14-arm64: runs-on: macos-14 needs: [ what-to-make ] diff --git a/CMakeLists.txt b/CMakeLists.txt index 6316f4fe2..5ddf12475 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ if(POLICY CMP0114) endif() # Value should follow latest stable Xcode's RECOMMENDED_MACOSX_DEPLOYMENT_TARGET -set(MACOS_SUPPORT_MINIMUM 10.14.6) +set(MACOS_SUPPORT_MINIMUM 11.0) # The value of this variable should be set prior to the first project() command invocation. # See: https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_DEPLOYMENT_TARGET.html diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index c72167555..8aece8cf5 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -4170,7 +4170,7 @@ INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = libtransmission/version.h; INFOPLIST_PREPROCESS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14.6; + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", @@ -4374,7 +4374,7 @@ INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = libtransmission/version.h; INFOPLIST_PREPROCESS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14.6; + MACOSX_DEPLOYMENT_TARGET = 11.0; OTHER_CFLAGS = ( "$(inherited)", "-DFMT_HEADER_ONLY", @@ -4478,7 +4478,7 @@ INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = libtransmission/version.h; INFOPLIST_PREPROCESS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14.6; + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", diff --git a/docs/Building-Transmission.md b/docs/Building-Transmission.md index 4c64cd412..027136f60 100644 --- a/docs/Building-Transmission.md +++ b/docs/Building-Transmission.md @@ -3,8 +3,8 @@ The source code for both official and nightly releases can be found on our [down ## On macOS ## Software prerequisites: - * macOS 10.14.4 or newer - * Xcode 11.3.1 or newer + * macOS 11.0 or newer + * Xcode 12.5.1 or newer Building the project on Mac requires the source to be retrieved from GitHub. Pre-packaged source code will not compile. ```bash diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt index 3be8fe014..a0a00c031 100644 --- a/macosx/CMakeLists.txt +++ b/macosx/CMakeLists.txt @@ -228,7 +228,6 @@ set_source_files_properties( set(IMAGESETS ActionHover - Bandwidth CleanupTemplate CompleteCheck CreateLarge @@ -236,17 +235,7 @@ set(IMAGESETS DownArrowTemplate DownloadBadge EllipsisTemplate - FavIcon - GearshapeTemplate Globe - Groups - InfoActivity - InfoFiles - InfoGeneral - InfoOptions - InfoPeers - InfoTracker - Lock Magnet PauseHover PauseOff @@ -258,7 +247,6 @@ set(IMAGESETS PriorityHighTemplate PriorityLowTemplate PriorityNormalTemplate - Remote ResumeHover ResumeNoWaitHover ResumeNoWaitOff @@ -268,18 +256,7 @@ set(IMAGESETS RevealHover RevealOff RevealOn - ToolbarCreateTemplate - ToolbarFilterTemplate - ToolbarInfoTemplate - ToolbarOpenTemplate - ToolbarOpenWebTemplate - ToolbarPauseAllTemplate - ToolbarPauseSelectedTemplate - ToolbarRemoveTemplate - ToolbarResumeAllTemplate - ToolbarResumeSelectedTemplate TortoiseTemplate - Transfers UpArrowGroupTemplate UpArrowTemplate UploadBadge diff --git a/macosx/CocoaCompatibility.h b/macosx/CocoaCompatibility.h index 3fe131c92..33865a741 100644 --- a/macosx/CocoaCompatibility.h +++ b/macosx/CocoaCompatibility.h @@ -6,38 +6,7 @@ NS_ASSUME_NONNULL_BEGIN -// Compatibility declarations to build `@available(macOS 11.0, *)` code with older Xcode 11.3.1 (the last 32-bit OS compatible Xcode) -#ifndef __MAC_11_0 - -typedef NS_ENUM(NSInteger, NSImageSymbolScale) { - NSImageSymbolScaleLarge = 3, -} API_AVAILABLE(macos(11.0)); - -@interface NSImage () -+ (nullable instancetype)imageWithSystemSymbolName:(NSString*)symbolName - accessibilityDescription:(nullable NSString*)description API_AVAILABLE(macos(11.0)); -@end - -typedef NS_ENUM(NSInteger, NSWindowToolbarStyle) { - NSWindowToolbarStylePreference = 2, - NSWindowToolbarStyleUnified = 3, -} API_AVAILABLE(macos(11.0)); - -@interface NSWindow () -@property NSWindowToolbarStyle toolbarStyle API_AVAILABLE(macos(11.0)); -@end - -typedef NS_ENUM(NSInteger, NSTableViewStyle) { - NSTableViewStyleFullWidth = 1, -} API_AVAILABLE(macos(11.0)); - -@interface NSTableView () -@property NSTableViewStyle style API_AVAILABLE(macos(11.0)); -@end - -#endif - -// Compatibility declarations to build `@available(macOS 13.0, *)` code with older Xcode 11.3.1 (the last 32-bit OS compatible Xcode) +// Compatibility declarations to build `@available(macOS 13.0, *)` code with older Xcode 12.5.1 (the last macOS 11.0 compatible Xcode) #ifndef __MAC_13_0 typedef NS_ENUM(NSInteger, NSColorWellStyle) { diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 0a6710240..30667411e 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -632,11 +632,8 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool toolbar.displayMode = NSToolbarDisplayModeIconOnly; self.fWindow.toolbar = toolbar; - if (@available(macOS 11.0, *)) - { - self.fWindow.toolbarStyle = NSWindowToolbarStyleUnified; - self.fWindow.titleVisibility = NSWindowTitleHidden; - } + self.fWindow.toolbarStyle = NSWindowToolbarStyleUnified; + self.fWindow.titleVisibility = NSWindowTitleHidden; self.fWindow.delegate = self; //do manually to avoid placement issue @@ -4207,17 +4204,6 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool item.view = button; - if (@available(macOS 11.0, *)) - { - //standard button sizes - } - else - { - NSSize const buttonSize = NSMakeSize(36.0, 25.0); - item.minSize = buttonSize; - item.maxSize = buttonSize; - } - return item; } @@ -4230,7 +4216,7 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool item.label = NSLocalizedString(@"Create", "Create toolbar item -> label"); item.paletteLabel = NSLocalizedString(@"Create Torrent File", "Create toolbar item -> palette label"); item.toolTip = NSLocalizedString(@"Create torrent file", "Create toolbar item -> tooltip"); - item.image = [NSImage systemSymbol:@"doc.badge.plus" withFallback:@"ToolbarCreateTemplate"]; + item.image = [NSImage imageWithSystemSymbolName:@"doc.badge.plus" accessibilityDescription:nil]; item.target = self; item.action = @selector(createFile:); item.autovalidates = NO; @@ -4244,7 +4230,7 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool item.label = NSLocalizedString(@"Open", "Open toolbar item -> label"); item.paletteLabel = NSLocalizedString(@"Open Torrent Files", "Open toolbar item -> palette label"); item.toolTip = NSLocalizedString(@"Open torrent files", "Open toolbar item -> tooltip"); - item.image = [NSImage systemSymbol:@"folder" withFallback:@"ToolbarOpenTemplate"]; + item.image = [NSImage imageWithSystemSymbolName:@"folder" accessibilityDescription:nil]; item.target = self; item.action = @selector(openShowSheet:); item.autovalidates = NO; @@ -4258,7 +4244,7 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool item.label = NSLocalizedString(@"Open Address", "Open address toolbar item -> label"); item.paletteLabel = NSLocalizedString(@"Open Torrent Address", "Open address toolbar item -> palette label"); item.toolTip = NSLocalizedString(@"Open torrent web address", "Open address toolbar item -> tooltip"); - item.image = [NSImage systemSymbol:@"globe" withFallback:@"ToolbarOpenWebTemplate"]; + item.image = [NSImage imageWithSystemSymbolName:@"globe" accessibilityDescription:nil]; item.target = self; item.action = @selector(openURLShowSheet:); item.autovalidates = NO; @@ -4272,7 +4258,7 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool item.label = NSLocalizedString(@"Remove", "Remove toolbar item -> label"); item.paletteLabel = NSLocalizedString(@"Remove Selected", "Remove toolbar item -> palette label"); item.toolTip = NSLocalizedString(@"Remove selected transfers", "Remove toolbar item -> tooltip"); - item.image = [NSImage systemSymbol:@"nosign" withFallback:@"ToolbarRemoveTemplate"]; + item.image = [NSImage imageWithSystemSymbolName:@"nosign" accessibilityDescription:nil]; item.target = self; item.action = @selector(removeNoDelete:); item.visibilityPriority = NSToolbarItemVisibilityPriorityHigh; @@ -4287,7 +4273,7 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool item.label = NSLocalizedString(@"Inspector", "Inspector toolbar item -> label"); item.paletteLabel = NSLocalizedString(@"Toggle Inspector", "Inspector toolbar item -> palette label"); item.toolTip = NSLocalizedString(@"Toggle the torrent inspector", "Inspector toolbar item -> tooltip"); - item.image = [NSImage systemSymbol:@"info.circle" withFallback:@"ToolbarInfoTemplate"]; + item.image = [NSImage imageWithSystemSymbolName:@"info.circle" accessibilityDescription:nil]; item.target = self; item.action = @selector(showInfo:); @@ -4306,13 +4292,13 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool segmentedControl.segmentCount = 2; [segmentedControl setTag:ToolbarGroupTagPause forSegment:ToolbarGroupTagPause]; - [segmentedControl setImage:[NSImage systemSymbol:@"pause.circle.fill" withFallback:@"ToolbarPauseAllTemplate"] + [segmentedControl setImage:[NSImage imageWithSystemSymbolName:@"pause.circle.fill" accessibilityDescription:nil] forSegment:ToolbarGroupTagPause]; [segmentedControl setToolTip:NSLocalizedString(@"Pause all transfers", "All toolbar item -> tooltip") forSegment:ToolbarGroupTagPause]; [segmentedControl setTag:ToolbarGroupTagResume forSegment:ToolbarGroupTagResume]; - [segmentedControl setImage:[NSImage systemSymbol:@"arrow.clockwise.circle.fill" withFallback:@"ToolbarResumeAllTemplate"] + [segmentedControl setImage:[NSImage imageWithSystemSymbolName:@"arrow.clockwise.circle.fill" accessibilityDescription:nil] forSegment:ToolbarGroupTagResume]; [segmentedControl setToolTip:NSLocalizedString(@"Resume all transfers", "All toolbar item -> tooltip") forSegment:ToolbarGroupTagResume]; @@ -4331,17 +4317,6 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool groupItem.target = self; groupItem.action = @selector(allToolbarClicked:); - if (@available(macOS 11.0, *)) - { - //standard segment size - } - else - { - NSSize const groupSize = NSMakeSize(72.0, 25.0); - groupItem.minSize = groupSize; - groupItem.maxSize = groupSize; - } - [groupItem createMenu:@[ NSLocalizedString(@"Pause All", "All toolbar item -> label"), NSLocalizedString(@"Resume All", "All toolbar item -> label") @@ -4362,13 +4337,13 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool segmentedControl.segmentCount = 2; [segmentedControl setTag:ToolbarGroupTagPause forSegment:ToolbarGroupTagPause]; - [segmentedControl setImage:[NSImage systemSymbol:@"pause" withFallback:@"ToolbarPauseSelectedTemplate"] + [segmentedControl setImage:[NSImage imageWithSystemSymbolName:@"pause" accessibilityDescription:nil] forSegment:ToolbarGroupTagPause]; [segmentedControl setToolTip:NSLocalizedString(@"Pause selected transfers", "Selected toolbar item -> tooltip") forSegment:ToolbarGroupTagPause]; [segmentedControl setTag:ToolbarGroupTagResume forSegment:ToolbarGroupTagResume]; - [segmentedControl setImage:[NSImage systemSymbol:@"arrow.clockwise" withFallback:@"ToolbarResumeSelectedTemplate"] + [segmentedControl setImage:[NSImage imageWithSystemSymbolName:@"arrow.clockwise" accessibilityDescription:nil] forSegment:ToolbarGroupTagResume]; [segmentedControl setToolTip:NSLocalizedString(@"Resume selected transfers", "Selected toolbar item -> tooltip") forSegment:ToolbarGroupTagResume]; @@ -4387,17 +4362,6 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool groupItem.target = self; groupItem.action = @selector(selectedToolbarClicked:); - if (@available(macOS 11.0, *)) - { - //standard segment size - } - else - { - NSSize const groupSize = NSMakeSize(72.0, 25.0); - groupItem.minSize = groupSize; - groupItem.maxSize = groupSize; - } - [groupItem createMenu:@[ NSLocalizedString(@"Pause Selected", "Selected toolbar item -> label"), NSLocalizedString(@"Resume Selected", "Selected toolbar item -> label") @@ -4413,7 +4377,7 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool item.label = NSLocalizedString(@"Filter", "Filter toolbar item -> label"); item.paletteLabel = NSLocalizedString(@"Toggle Filter", "Filter toolbar item -> palette label"); item.toolTip = NSLocalizedString(@"Toggle the filter bar", "Filter toolbar item -> tooltip"); - item.image = [NSImage systemSymbol:@"magnifyingglass" withFallback:@"ToolbarFilterTemplate"]; + item.image = [NSImage imageWithSystemSymbolName:@"magnifyingglass" accessibilityDescription:nil]; item.target = self; item.action = @selector(toggleFilterBar:); @@ -5263,16 +5227,9 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool //Hacky way of fixing an issue with showing the Toolbar if (!self.isFullScreen) { - //macOS Big Sur shows the unified toolbar by default + //macOS shows the unified toolbar by default //and we only need to "fix" the layout when showing the toolbar - if (@available(macOS 11.0, *)) - { - if (!self.fWindow.toolbar.isVisible) - { - [self removeStackViewHeightConstraints]; - } - } - else + if (!self.fWindow.toolbar.isVisible) { [self removeStackViewHeightConstraints]; } @@ -5289,12 +5246,9 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool - (void)hideToolBarBezels:(BOOL)hide { - if (@available(macOS 11.0, *)) + for (NSToolbarItem* item in self.fWindow.toolbar.items) { - for (NSToolbarItem* item in self.fWindow.toolbar.items) - { - item.view.hidden = hide; - } + item.view.hidden = hide; } } diff --git a/macosx/DefaultAppHelper.mm b/macosx/DefaultAppHelper.mm index ff8ec8ee5..07eb2c6de 100644 --- a/macosx/DefaultAppHelper.mm +++ b/macosx/DefaultAppHelper.mm @@ -120,34 +120,18 @@ UTType* GetTorrentFileType(void) API_AVAILABLE(macos(11.0)) - (BOOL)isDefaultForMagnetURLs { - if (@available(macOS 12, *)) + NSURL* schemeUrl = [NSURL URLWithString:[kMagnetURLScheme stringByAppendingString:@":"]]; + NSURL* appUrl = [NSWorkspace.sharedWorkspace URLForApplicationToOpenURL:schemeUrl]; + if (!appUrl) { - NSURL* schemeUrl = [NSURL URLWithString:[kMagnetURLScheme stringByAppendingString:@":"]]; - NSURL* appUrl = [NSWorkspace.sharedWorkspace URLForApplicationToOpenURL:schemeUrl]; - if (!appUrl) - { - return NO; - } - - NSString* bundleId = [NSBundle bundleWithURL:appUrl].bundleIdentifier; - - if ([self.bundleIdentifier isEqualToString:bundleId]) - { - return YES; - } + return NO; } - else - { - NSString* bundleId = (__bridge_transfer NSString*)LSCopyDefaultHandlerForURLScheme((__bridge CFStringRef)kMagnetURLScheme); - if (!bundleId) - { - return NO; - } - if ([self.bundleIdentifier isEqualToString:bundleId]) - { - return YES; - } + NSString* bundleId = [NSBundle bundleWithURL:appUrl].bundleIdentifier; + + if ([self.bundleIdentifier isEqualToString:bundleId]) + { + return YES; } return NO; diff --git a/macosx/Images/Images.xcassets/Bandwidth.imageset/Bandwidth.png b/macosx/Images/Images.xcassets/Bandwidth.imageset/Bandwidth.png deleted file mode 100644 index 89dacb610..000000000 Binary files a/macosx/Images/Images.xcassets/Bandwidth.imageset/Bandwidth.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/Bandwidth.imageset/Bandwidth@2x.png b/macosx/Images/Images.xcassets/Bandwidth.imageset/Bandwidth@2x.png deleted file mode 100644 index dbf6996c8..000000000 Binary files a/macosx/Images/Images.xcassets/Bandwidth.imageset/Bandwidth@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/Bandwidth.imageset/Contents.json b/macosx/Images/Images.xcassets/Bandwidth.imageset/Contents.json deleted file mode 100644 index 63a1630e2..000000000 --- a/macosx/Images/Images.xcassets/Bandwidth.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "Bandwidth.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "Bandwidth@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/FavIcon.imageset/Contents.json b/macosx/Images/Images.xcassets/FavIcon.imageset/Contents.json deleted file mode 100644 index 08f368170..000000000 --- a/macosx/Images/Images.xcassets/FavIcon.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "FavIcon.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "FavIcon@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/FavIcon.imageset/FavIcon.png b/macosx/Images/Images.xcassets/FavIcon.imageset/FavIcon.png deleted file mode 100644 index 77d6f0258..000000000 Binary files a/macosx/Images/Images.xcassets/FavIcon.imageset/FavIcon.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/FavIcon.imageset/FavIcon@2x.png b/macosx/Images/Images.xcassets/FavIcon.imageset/FavIcon@2x.png deleted file mode 100644 index 77d6f0258..000000000 Binary files a/macosx/Images/Images.xcassets/FavIcon.imageset/FavIcon@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/GearshapeTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/GearshapeTemplate.imageset/Contents.json deleted file mode 100644 index 5e6e9c98c..000000000 --- a/macosx/Images/Images.xcassets/GearshapeTemplate.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "GearshapeTemplate.png", - "idiom" : "mac", - "scale" : "1x" - }, - { - "filename" : "GearshapeTemplate@2x.png", - "idiom" : "mac", - "scale" : "2x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" - } -} diff --git a/macosx/Images/Images.xcassets/GearshapeTemplate.imageset/GearshapeTemplate.png b/macosx/Images/Images.xcassets/GearshapeTemplate.imageset/GearshapeTemplate.png deleted file mode 100644 index e2062d457..000000000 Binary files a/macosx/Images/Images.xcassets/GearshapeTemplate.imageset/GearshapeTemplate.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/GearshapeTemplate.imageset/GearshapeTemplate@2x.png b/macosx/Images/Images.xcassets/GearshapeTemplate.imageset/GearshapeTemplate@2x.png deleted file mode 100644 index f704a671b..000000000 Binary files a/macosx/Images/Images.xcassets/GearshapeTemplate.imageset/GearshapeTemplate@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/Groups.imageset/Contents.json b/macosx/Images/Images.xcassets/Groups.imageset/Contents.json deleted file mode 100644 index c4553ede9..000000000 --- a/macosx/Images/Images.xcassets/Groups.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "Groups.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "Groups@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/Groups.imageset/Groups.png b/macosx/Images/Images.xcassets/Groups.imageset/Groups.png deleted file mode 100644 index 007009d80..000000000 Binary files a/macosx/Images/Images.xcassets/Groups.imageset/Groups.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/Groups.imageset/Groups@2x.png b/macosx/Images/Images.xcassets/Groups.imageset/Groups@2x.png deleted file mode 100644 index 2c26daf52..000000000 Binary files a/macosx/Images/Images.xcassets/Groups.imageset/Groups@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoActivity.imageset/Contents.json b/macosx/Images/Images.xcassets/InfoActivity.imageset/Contents.json deleted file mode 100644 index c78dfcd88..000000000 --- a/macosx/Images/Images.xcassets/InfoActivity.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "InfoActivity.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "InfoActivity@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/InfoActivity.imageset/InfoActivity.png b/macosx/Images/Images.xcassets/InfoActivity.imageset/InfoActivity.png deleted file mode 100644 index 23ec0c6d0..000000000 Binary files a/macosx/Images/Images.xcassets/InfoActivity.imageset/InfoActivity.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoActivity.imageset/InfoActivity@2x.png b/macosx/Images/Images.xcassets/InfoActivity.imageset/InfoActivity@2x.png deleted file mode 100644 index ff1cd60d9..000000000 Binary files a/macosx/Images/Images.xcassets/InfoActivity.imageset/InfoActivity@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoFiles.imageset/Contents.json b/macosx/Images/Images.xcassets/InfoFiles.imageset/Contents.json deleted file mode 100644 index 00e8bc97a..000000000 --- a/macosx/Images/Images.xcassets/InfoFiles.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "InfoFiles.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "InfoFiles@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/InfoFiles.imageset/InfoFiles.png b/macosx/Images/Images.xcassets/InfoFiles.imageset/InfoFiles.png deleted file mode 100644 index 42febc387..000000000 Binary files a/macosx/Images/Images.xcassets/InfoFiles.imageset/InfoFiles.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoFiles.imageset/InfoFiles@2x.png b/macosx/Images/Images.xcassets/InfoFiles.imageset/InfoFiles@2x.png deleted file mode 100644 index 811574485..000000000 Binary files a/macosx/Images/Images.xcassets/InfoFiles.imageset/InfoFiles@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoGeneral.imageset/Contents.json b/macosx/Images/Images.xcassets/InfoGeneral.imageset/Contents.json deleted file mode 100644 index 6e034c312..000000000 --- a/macosx/Images/Images.xcassets/InfoGeneral.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "InfoGeneral.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "InfoGeneral@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/InfoGeneral.imageset/InfoGeneral.png b/macosx/Images/Images.xcassets/InfoGeneral.imageset/InfoGeneral.png deleted file mode 100644 index 8f4bf91c5..000000000 Binary files a/macosx/Images/Images.xcassets/InfoGeneral.imageset/InfoGeneral.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoGeneral.imageset/InfoGeneral@2x.png b/macosx/Images/Images.xcassets/InfoGeneral.imageset/InfoGeneral@2x.png deleted file mode 100644 index 3234b2f2d..000000000 Binary files a/macosx/Images/Images.xcassets/InfoGeneral.imageset/InfoGeneral@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoOptions.imageset/Contents.json b/macosx/Images/Images.xcassets/InfoOptions.imageset/Contents.json deleted file mode 100644 index 1109d9663..000000000 --- a/macosx/Images/Images.xcassets/InfoOptions.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "InfoOptions.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "InfoOptions@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/InfoOptions.imageset/InfoOptions.png b/macosx/Images/Images.xcassets/InfoOptions.imageset/InfoOptions.png deleted file mode 100644 index 88f06e628..000000000 Binary files a/macosx/Images/Images.xcassets/InfoOptions.imageset/InfoOptions.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoOptions.imageset/InfoOptions@2x.png b/macosx/Images/Images.xcassets/InfoOptions.imageset/InfoOptions@2x.png deleted file mode 100644 index 136823f57..000000000 Binary files a/macosx/Images/Images.xcassets/InfoOptions.imageset/InfoOptions@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoPeers.imageset/Contents.json b/macosx/Images/Images.xcassets/InfoPeers.imageset/Contents.json deleted file mode 100644 index cb3c8981f..000000000 --- a/macosx/Images/Images.xcassets/InfoPeers.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "InfoPeers.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "InfoPeers@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/InfoPeers.imageset/InfoPeers.png b/macosx/Images/Images.xcassets/InfoPeers.imageset/InfoPeers.png deleted file mode 100644 index 9d68cb564..000000000 Binary files a/macosx/Images/Images.xcassets/InfoPeers.imageset/InfoPeers.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoPeers.imageset/InfoPeers@2x.png b/macosx/Images/Images.xcassets/InfoPeers.imageset/InfoPeers@2x.png deleted file mode 100644 index 30b7b6cfb..000000000 Binary files a/macosx/Images/Images.xcassets/InfoPeers.imageset/InfoPeers@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoTracker.imageset/Contents.json b/macosx/Images/Images.xcassets/InfoTracker.imageset/Contents.json deleted file mode 100644 index 2c70abd8b..000000000 --- a/macosx/Images/Images.xcassets/InfoTracker.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "InfoTracker.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "InfoTracker@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/InfoTracker.imageset/InfoTracker.png b/macosx/Images/Images.xcassets/InfoTracker.imageset/InfoTracker.png deleted file mode 100644 index 9d206aa92..000000000 Binary files a/macosx/Images/Images.xcassets/InfoTracker.imageset/InfoTracker.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/InfoTracker.imageset/InfoTracker@2x.png b/macosx/Images/Images.xcassets/InfoTracker.imageset/InfoTracker@2x.png deleted file mode 100644 index 0aec8d063..000000000 Binary files a/macosx/Images/Images.xcassets/InfoTracker.imageset/InfoTracker@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/Lock.imageset/Contents.json b/macosx/Images/Images.xcassets/Lock.imageset/Contents.json deleted file mode 100644 index 85201ae30..000000000 --- a/macosx/Images/Images.xcassets/Lock.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "Lock.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "Lock@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/Lock.imageset/Lock.png b/macosx/Images/Images.xcassets/Lock.imageset/Lock.png deleted file mode 100644 index 2395a5ba8..000000000 Binary files a/macosx/Images/Images.xcassets/Lock.imageset/Lock.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/Lock.imageset/Lock@2x.png b/macosx/Images/Images.xcassets/Lock.imageset/Lock@2x.png deleted file mode 100644 index 7fbcb55d1..000000000 Binary files a/macosx/Images/Images.xcassets/Lock.imageset/Lock@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/Remote.imageset/Contents.json b/macosx/Images/Images.xcassets/Remote.imageset/Contents.json deleted file mode 100644 index 2104167a0..000000000 --- a/macosx/Images/Images.xcassets/Remote.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "Remote.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "Remote@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/Remote.imageset/Remote.png b/macosx/Images/Images.xcassets/Remote.imageset/Remote.png deleted file mode 100644 index 1b2b7a427..000000000 Binary files a/macosx/Images/Images.xcassets/Remote.imageset/Remote.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/Remote.imageset/Remote@2x.png b/macosx/Images/Images.xcassets/Remote.imageset/Remote@2x.png deleted file mode 100644 index 47451e86d..000000000 Binary files a/macosx/Images/Images.xcassets/Remote.imageset/Remote@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/Contents.json deleted file mode 100644 index 3d2ad25da..000000000 --- a/macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "ToolbarCreateTemplate.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "ToolbarCreateTemplate@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/ToolbarCreateTemplate.png b/macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/ToolbarCreateTemplate.png deleted file mode 100644 index 8393ee008..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/ToolbarCreateTemplate.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/ToolbarCreateTemplate@2x.png b/macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/ToolbarCreateTemplate@2x.png deleted file mode 100644 index 218b8bae7..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/ToolbarCreateTemplate@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/Contents.json deleted file mode 100644 index 2b707d6ff..000000000 --- a/macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "ToolbarFilterTemplate.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "ToolbarFilterTemplate@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/ToolbarFilterTemplate.png b/macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/ToolbarFilterTemplate.png deleted file mode 100644 index b8a1a6ebd..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/ToolbarFilterTemplate.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/ToolbarFilterTemplate@2x.png b/macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/ToolbarFilterTemplate@2x.png deleted file mode 100644 index bca05c3b8..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/ToolbarFilterTemplate@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/Contents.json deleted file mode 100644 index ec018afb4..000000000 --- a/macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "ToolbarInfoTemplate.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "ToolbarInfoTemplate@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/ToolbarInfoTemplate.png b/macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/ToolbarInfoTemplate.png deleted file mode 100644 index 5700c33d4..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/ToolbarInfoTemplate.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/ToolbarInfoTemplate@2x.png b/macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/ToolbarInfoTemplate@2x.png deleted file mode 100644 index a884f587b..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/ToolbarInfoTemplate@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/Contents.json deleted file mode 100644 index c00ec7ade..000000000 --- a/macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "ToolbarOpenTemplate.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "ToolbarOpenTemplate@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/ToolbarOpenTemplate.png b/macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/ToolbarOpenTemplate.png deleted file mode 100644 index 9b50a0a66..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/ToolbarOpenTemplate.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/ToolbarOpenTemplate@2x.png b/macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/ToolbarOpenTemplate@2x.png deleted file mode 100644 index 7672a1057..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/ToolbarOpenTemplate@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/Contents.json deleted file mode 100644 index 1896f8a92..000000000 --- a/macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "ToolbarOpenWebTemplate.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "ToolbarOpenWebTemplate@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/ToolbarOpenWebTemplate.png b/macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/ToolbarOpenWebTemplate.png deleted file mode 100644 index ac702c08b..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/ToolbarOpenWebTemplate.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/ToolbarOpenWebTemplate@2x.png b/macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/ToolbarOpenWebTemplate@2x.png deleted file mode 100644 index 01f5a3c90..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/ToolbarOpenWebTemplate@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/Contents.json deleted file mode 100644 index bf89c3386..000000000 --- a/macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "ToolbarPauseAllTemplate.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "ToolbarPauseAllTemplate@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/ToolbarPauseAllTemplate.png b/macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/ToolbarPauseAllTemplate.png deleted file mode 100644 index 340d3333b..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/ToolbarPauseAllTemplate.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/ToolbarPauseAllTemplate@2x.png b/macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/ToolbarPauseAllTemplate@2x.png deleted file mode 100644 index 5905afaa9..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/ToolbarPauseAllTemplate@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/Contents.json deleted file mode 100644 index 09dd25ba5..000000000 --- a/macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "ToolbarPauseSelectedTemplate.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "ToolbarPauseSelectedTemplate@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/ToolbarPauseSelectedTemplate.png b/macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/ToolbarPauseSelectedTemplate.png deleted file mode 100644 index d8572bfd5..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/ToolbarPauseSelectedTemplate.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/ToolbarPauseSelectedTemplate@2x.png b/macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/ToolbarPauseSelectedTemplate@2x.png deleted file mode 100644 index 87446c48d..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/ToolbarPauseSelectedTemplate@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/Contents.json deleted file mode 100644 index 2af6516f2..000000000 --- a/macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "ToolbarRemoveTemplate.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "ToolbarRemoveTemplate@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/ToolbarRemoveTemplate.png b/macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/ToolbarRemoveTemplate.png deleted file mode 100644 index ef266322e..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/ToolbarRemoveTemplate.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/ToolbarRemoveTemplate@2x.png b/macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/ToolbarRemoveTemplate@2x.png deleted file mode 100644 index 90916a653..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/ToolbarRemoveTemplate@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/Contents.json deleted file mode 100644 index a2281a17a..000000000 --- a/macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "ToolbarResumeAllTemplate.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "ToolbarResumeAllTemplate@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/ToolbarResumeAllTemplate.png b/macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/ToolbarResumeAllTemplate.png deleted file mode 100644 index 6a630b7c8..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/ToolbarResumeAllTemplate.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/ToolbarResumeAllTemplate@2x.png b/macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/ToolbarResumeAllTemplate@2x.png deleted file mode 100644 index 660232190..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/ToolbarResumeAllTemplate@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/Contents.json b/macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/Contents.json deleted file mode 100644 index 01fc13be5..000000000 --- a/macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "ToolbarResumeSelectedTemplate.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "ToolbarResumeSelectedTemplate@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/ToolbarResumeSelectedTemplate.png b/macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/ToolbarResumeSelectedTemplate.png deleted file mode 100644 index f4999debf..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/ToolbarResumeSelectedTemplate.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/ToolbarResumeSelectedTemplate@2x.png b/macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/ToolbarResumeSelectedTemplate@2x.png deleted file mode 100644 index 91d01d5f4..000000000 Binary files a/macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/ToolbarResumeSelectedTemplate@2x.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/Transfers.imageset/Contents.json b/macosx/Images/Images.xcassets/Transfers.imageset/Contents.json deleted file mode 100644 index 9ccefef3b..000000000 --- a/macosx/Images/Images.xcassets/Transfers.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "filename" : "Transfers.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "Transfers@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "original" - } -} \ No newline at end of file diff --git a/macosx/Images/Images.xcassets/Transfers.imageset/Transfers.png b/macosx/Images/Images.xcassets/Transfers.imageset/Transfers.png deleted file mode 100644 index b4617aab7..000000000 Binary files a/macosx/Images/Images.xcassets/Transfers.imageset/Transfers.png and /dev/null differ diff --git a/macosx/Images/Images.xcassets/Transfers.imageset/Transfers@2x.png b/macosx/Images/Images.xcassets/Transfers.imageset/Transfers@2x.png deleted file mode 100644 index 24fddf1c8..000000000 Binary files a/macosx/Images/Images.xcassets/Transfers.imageset/Transfers@2x.png and /dev/null differ diff --git a/macosx/InfoPeersViewController.mm b/macosx/InfoPeersViewController.mm index 483777e94..6bce35dd8 100644 --- a/macosx/InfoPeersViewController.mm +++ b/macosx/InfoPeersViewController.mm @@ -353,7 +353,7 @@ static NSString* const kWebSeedAnimationId = @"webSeed"; if ([ident isEqualToString:@"Encryption"]) { - return [peer[@"Encryption"] boolValue] ? [NSImage systemSymbol:@"lock.fill" withFallback:@"Lock"] : nil; + return [peer[@"Encryption"] boolValue] ? [NSImage imageWithSystemSymbolName:@"lock.fill" accessibilityDescription:nil] : nil; } else if ([ident isEqualToString:@"Client"]) { diff --git a/macosx/InfoWindowController.mm b/macosx/InfoWindowController.mm index bc056bf24..d5a60f78b 100644 --- a/macosx/InfoWindowController.mm +++ b/macosx/InfoWindowController.mm @@ -102,21 +102,27 @@ typedef NS_ENUM(NSUInteger, TabTag) { [self.fTabs.cell setToolTip:toolTip forSegment:segment]; }; setImageAndToolTipForSegment( - [NSImage systemSymbol:@"info.circle" withFallback:@"InfoGeneral"], + [NSImage imageWithSystemSymbolName:@"info.circle" accessibilityDescription:nil], NSLocalizedString(@"General Info", "Inspector -> tab"), TabTagGeneral); setImageAndToolTipForSegment( - [NSImage systemSymbol:@"square.grid.3x3.fill.square" withFallback:@"InfoActivity"], + [NSImage imageWithSystemSymbolName:@"square.grid.3x3.fill.square" accessibilityDescription:nil], NSLocalizedString(@"Activity", "Inspector -> tab"), TabTagActivity); setImageAndToolTipForSegment( - [NSImage systemSymbol:@"antenna.radiowaves.left.and.right" withFallback:@"InfoTracker"], + [NSImage imageWithSystemSymbolName:@"antenna.radiowaves.left.and.right" accessibilityDescription:nil], NSLocalizedString(@"Trackers", "Inspector -> tab"), TabTagTrackers); - setImageAndToolTipForSegment([NSImage systemSymbol:@"person.2" withFallback:@"InfoPeers"], NSLocalizedString(@"Peers", "Inspector -> tab"), TabTagPeers); - setImageAndToolTipForSegment([NSImage systemSymbol:@"doc.on.doc" withFallback:@"InfoFiles"], NSLocalizedString(@"Files", "Inspector -> tab"), TabTagFile); setImageAndToolTipForSegment( - [NSImage systemSymbol:@"gearshape" withFallback:@"InfoOptions"], + [NSImage imageWithSystemSymbolName:@"person.2" accessibilityDescription:nil], + NSLocalizedString(@"Peers", "Inspector -> tab"), + TabTagPeers); + setImageAndToolTipForSegment( + [NSImage imageWithSystemSymbolName:@"doc.on.doc" accessibilityDescription:nil], + NSLocalizedString(@"Files", "Inspector -> tab"), + TabTagFile); + setImageAndToolTipForSegment( + [NSImage imageWithSystemSymbolName:@"gearshape" accessibilityDescription:nil], NSLocalizedString(@"Options", "Inspector -> tab"), TabTagOptions); diff --git a/macosx/NSImageAdditions.h b/macosx/NSImageAdditions.h index 8ae90f6b0..dfc007a2f 100644 --- a/macosx/NSImageAdditions.h +++ b/macosx/NSImageAdditions.h @@ -9,8 +9,4 @@ + (NSImage*)discIconWithColor:(NSColor*)color insetFactor:(CGFloat)insetFactor; - (NSImage*)imageWithColor:(NSColor*)color; -/* macOS < 11 compatibility */ -+ (NSImage*)systemSymbol:(NSString*)symbolName withFallback:(NSString*)fallbackName; -+ (NSImage*)largeSystemSymbol:(NSString*)symbolName withFallback:(NSString*)fallbackName; - @end diff --git a/macosx/NSImageAdditions.mm b/macosx/NSImageAdditions.mm index 0abdde9d4..adecdfded 100644 --- a/macosx/NSImageAdditions.mm +++ b/macosx/NSImageAdditions.mm @@ -50,27 +50,4 @@ static CGFloat const kBorderWidth = 1.25; return coloredImage; } -+ (NSImage*)systemSymbol:(NSString*)symbolName withFallback:(NSString*)fallbackName -{ - if (@available(macOS 11.0, *)) - { - return [NSImage imageWithSystemSymbolName:symbolName accessibilityDescription:nil]; - } - - return [NSImage imageNamed:fallbackName]; -} - -+ (NSImage*)largeSystemSymbol:(NSString*)symbolName withFallback:(NSString*)fallbackName -{ -#ifdef __MAC_11_0 - if (@available(macOS 11.0, *)) - { - return [[NSImage imageWithSystemSymbolName:symbolName accessibilityDescription:nil] - imageWithSymbolConfiguration:[NSImageSymbolConfiguration configurationWithScale:NSImageSymbolScaleLarge]]; - } -#endif - - return [NSImage imageNamed:fallbackName]; -} - @end diff --git a/macosx/PrefsController.mm b/macosx/PrefsController.mm index e9699a001..8460dcec0 100644 --- a/macosx/PrefsController.mm +++ b/macosx/PrefsController.mm @@ -302,7 +302,7 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/"; if ([ident isEqualToString:ToolbarTabGeneral]) { item.label = NSLocalizedString(@"General", "Preferences -> toolbar item title"); - item.image = [NSImage systemSymbol:@"gearshape" withFallback:NSImageNamePreferencesGeneral]; + item.image = [NSImage imageWithSystemSymbolName:@"gearshape" accessibilityDescription:nil]; item.target = self; item.action = @selector(setPrefView:); item.autovalidates = NO; @@ -310,7 +310,7 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/"; else if ([ident isEqualToString:ToolbarTabTransfers]) { item.label = NSLocalizedString(@"Transfers", "Preferences -> toolbar item title"); - item.image = [NSImage systemSymbol:@"arrow.up.arrow.down" withFallback:@"Transfers"]; + item.image = [NSImage imageWithSystemSymbolName:@"arrow.up.arrow.down" accessibilityDescription:nil]; item.target = self; item.action = @selector(setPrefView:); item.autovalidates = NO; @@ -318,7 +318,7 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/"; else if ([ident isEqualToString:ToolbarTabGroups]) { item.label = NSLocalizedString(@"Groups", "Preferences -> toolbar item title"); - item.image = [NSImage systemSymbol:@"pin" withFallback:@"Groups"]; + item.image = [NSImage imageWithSystemSymbolName:@"pin" accessibilityDescription:nil]; item.target = self; item.action = @selector(setPrefView:); item.autovalidates = NO; @@ -326,7 +326,7 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/"; else if ([ident isEqualToString:ToolbarTabBandwidth]) { item.label = NSLocalizedString(@"Bandwidth", "Preferences -> toolbar item title"); - item.image = [NSImage systemSymbol:@"speedometer" withFallback:@"Bandwidth"]; + item.image = [NSImage imageWithSystemSymbolName:@"speedometer" accessibilityDescription:nil]; item.target = self; item.action = @selector(setPrefView:); item.autovalidates = NO; @@ -334,7 +334,7 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/"; else if ([ident isEqualToString:ToolbarTabPeers]) { item.label = NSLocalizedString(@"Peers", "Preferences -> toolbar item title"); - item.image = [NSImage systemSymbol:@"person.2" withFallback:NSImageNameUserGroup]; + item.image = [NSImage imageWithSystemSymbolName:@"person.2" accessibilityDescription:nil]; item.target = self; item.action = @selector(setPrefView:); item.autovalidates = NO; @@ -342,7 +342,7 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/"; else if ([ident isEqualToString:ToolbarTabNetwork]) { item.label = NSLocalizedString(@"Network", "Preferences -> toolbar item title"); - item.image = [NSImage systemSymbol:@"network" withFallback:NSImageNameNetwork]; + item.image = [NSImage imageWithSystemSymbolName:@"network" accessibilityDescription:nil]; item.target = self; item.action = @selector(setPrefView:); item.autovalidates = NO; @@ -350,7 +350,7 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/"; else if ([ident isEqualToString:ToolbarTabRemote]) { item.label = NSLocalizedString(@"Remote", "Preferences -> toolbar item title"); - item.image = [NSImage systemSymbol:@"antenna.radiowaves.left.and.right" withFallback:@"Remote"]; + item.image = [NSImage imageWithSystemSymbolName:@"antenna.radiowaves.left.and.right" accessibilityDescription:nil]; item.target = self; item.action = @selector(setPrefView:); item.autovalidates = NO; diff --git a/macosx/PrefsWindow.mm b/macosx/PrefsWindow.mm index cf1fb0d32..8c198d30a 100644 --- a/macosx/PrefsWindow.mm +++ b/macosx/PrefsWindow.mm @@ -12,10 +12,7 @@ { [super awakeFromNib]; - if (@available(macOS 11.0, *)) - { - self.toolbarStyle = NSWindowToolbarStylePreference; - } + self.toolbarStyle = NSWindowToolbarStylePreference; } - (void)keyDown:(NSEvent*)event diff --git a/macosx/TorrentTableView.mm b/macosx/TorrentTableView.mm index 44cb140cb..df3db7293 100644 --- a/macosx/TorrentTableView.mm +++ b/macosx/TorrentTableView.mm @@ -82,10 +82,7 @@ static NSTimeInterval const kToggleProgressSeconds = 0.175; _piecesBarPercent = [_fDefaults boolForKey:@"PiecesBar"] ? 1.0 : 0.0; - if (@available(macOS 11.0, *)) - { - self.style = NSTableViewStyleFullWidth; - } + self.style = NSTableViewStyleFullWidth; } return self; diff --git a/macosx/TrackerCell.mm b/macosx/TrackerCell.mm index 55559b598..cf874ec03 100644 --- a/macosx/TrackerCell.mm +++ b/macosx/TrackerCell.mm @@ -183,18 +183,13 @@ static NSMutableSet* fTrackerIconLoading; return icon; } - if (@available(macOS 11.0, *)) - { - NSImage* result = [NSImage imageWithSystemSymbolName:@"globe" accessibilityDescription:nil]; - [result lockFocus]; - [NSColor.textColor set]; - NSRect imageRect = { NSZeroPoint, result.size }; - NSRectFillUsingOperation(imageRect, NSCompositingOperationSourceIn); - [result unlockFocus]; - return result; - } - - return [NSImage imageNamed:@"FavIcon"]; + NSImage* result = [NSImage imageWithSystemSymbolName:@"globe" accessibilityDescription:nil]; + [result lockFocus]; + [NSColor.textColor set]; + NSRect imageRect = { NSZeroPoint, result.size }; + NSRectFillUsingOperation(imageRect, NSCompositingOperationSourceIn); + [result unlockFocus]; + return result; } - (void)loadTrackerIcon:(NSString*)baseAddress