From d9d87eddd835bb5a76470198fc52c6179894d542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C5=93ur?= Date: Thu, 22 Aug 2024 22:07:17 +0200 Subject: [PATCH] Bumping MACOSX_DEPLOYMENT_TARGET to 11.0 (#6911) * Bumping MACOSX_DEPLOYMENT_TARGET to 11.0 * removing obsolete code and resources * Add a build action for Transmission.xcodeproj * removing obsolete code --- .github/workflows/actions.yml | 22 +++++ CMakeLists.txt | 2 +- Transmission.xcodeproj/project.pbxproj | 6 +- docs/Building-Transmission.md | 4 +- macosx/CMakeLists.txt | 23 ------ macosx/CocoaCompatibility.h | 33 +------- macosx/Controller.mm | 78 ++++-------------- macosx/DefaultAppHelper.mm | 34 ++------ .../Bandwidth.imageset/Bandwidth.png | Bin 1765 -> 0 bytes .../Bandwidth.imageset/Bandwidth@2x.png | Bin 4913 -> 0 bytes .../Bandwidth.imageset/Contents.json | 21 ----- .../FavIcon.imageset/Contents.json | 21 ----- .../FavIcon.imageset/FavIcon.png | Bin 2209 -> 0 bytes .../FavIcon.imageset/FavIcon@2x.png | Bin 2209 -> 0 bytes .../GearshapeTemplate.imageset/Contents.json | 21 ----- .../GearshapeTemplate.png | Bin 187 -> 0 bytes .../GearshapeTemplate@2x.png | Bin 349 -> 0 bytes .../Groups.imageset/Contents.json | 21 ----- .../Groups.imageset/Groups.png | Bin 1278 -> 0 bytes .../Groups.imageset/Groups@2x.png | Bin 3366 -> 0 bytes .../InfoActivity.imageset/Contents.json | 21 ----- .../InfoActivity.imageset/InfoActivity.png | Bin 537 -> 0 bytes .../InfoActivity.imageset/InfoActivity@2x.png | Bin 1124 -> 0 bytes .../InfoFiles.imageset/Contents.json | 21 ----- .../InfoFiles.imageset/InfoFiles.png | Bin 346 -> 0 bytes .../InfoFiles.imageset/InfoFiles@2x.png | Bin 549 -> 0 bytes .../InfoGeneral.imageset/Contents.json | 21 ----- .../InfoGeneral.imageset/InfoGeneral.png | Bin 879 -> 0 bytes .../InfoGeneral.imageset/InfoGeneral@2x.png | Bin 2492 -> 0 bytes .../InfoOptions.imageset/Contents.json | 21 ----- .../InfoOptions.imageset/InfoOptions.png | Bin 853 -> 0 bytes .../InfoOptions.imageset/InfoOptions@2x.png | Bin 2430 -> 0 bytes .../InfoPeers.imageset/Contents.json | 21 ----- .../InfoPeers.imageset/InfoPeers.png | Bin 334 -> 0 bytes .../InfoPeers.imageset/InfoPeers@2x.png | Bin 755 -> 0 bytes .../InfoTracker.imageset/Contents.json | 21 ----- .../InfoTracker.imageset/InfoTracker.png | Bin 429 -> 0 bytes .../InfoTracker.imageset/InfoTracker@2x.png | Bin 970 -> 0 bytes .../Lock.imageset/Contents.json | 21 ----- .../Images.xcassets/Lock.imageset/Lock.png | Bin 514 -> 0 bytes .../Images.xcassets/Lock.imageset/Lock@2x.png | Bin 811 -> 0 bytes .../Remote.imageset/Contents.json | 21 ----- .../Remote.imageset/Remote.png | Bin 1306 -> 0 bytes .../Remote.imageset/Remote@2x.png | Bin 2890 -> 0 bytes .../Contents.json | 21 ----- .../ToolbarCreateTemplate.png | Bin 138 -> 0 bytes .../ToolbarCreateTemplate@2x.png | Bin 184 -> 0 bytes .../Contents.json | 21 ----- .../ToolbarFilterTemplate.png | Bin 191 -> 0 bytes .../ToolbarFilterTemplate@2x.png | Bin 318 -> 0 bytes .../Contents.json | 21 ----- .../ToolbarInfoTemplate.png | Bin 169 -> 0 bytes .../ToolbarInfoTemplate@2x.png | Bin 257 -> 0 bytes .../Contents.json | 21 ----- .../ToolbarOpenTemplate.png | Bin 163 -> 0 bytes .../ToolbarOpenTemplate@2x.png | Bin 250 -> 0 bytes .../Contents.json | 21 ----- .../ToolbarOpenWebTemplate.png | Bin 278 -> 0 bytes .../ToolbarOpenWebTemplate@2x.png | Bin 543 -> 0 bytes .../Contents.json | 21 ----- .../ToolbarPauseAllTemplate.png | Bin 191 -> 0 bytes .../ToolbarPauseAllTemplate@2x.png | Bin 302 -> 0 bytes .../Contents.json | 21 ----- .../ToolbarPauseSelectedTemplate.png | Bin 76 -> 0 bytes .../ToolbarPauseSelectedTemplate@2x.png | Bin 87 -> 0 bytes .../Contents.json | 21 ----- .../ToolbarRemoveTemplate.png | Bin 260 -> 0 bytes .../ToolbarRemoveTemplate@2x.png | Bin 454 -> 0 bytes .../Contents.json | 21 ----- .../ToolbarResumeAllTemplate.png | Bin 276 -> 0 bytes .../ToolbarResumeAllTemplate@2x.png | Bin 534 -> 0 bytes .../Contents.json | 21 ----- .../ToolbarResumeSelectedTemplate.png | Bin 219 -> 0 bytes .../ToolbarResumeSelectedTemplate@2x.png | Bin 391 -> 0 bytes .../Transfers.imageset/Contents.json | 21 ----- .../Transfers.imageset/Transfers.png | Bin 427 -> 0 bytes .../Transfers.imageset/Transfers@2x.png | Bin 761 -> 0 bytes macosx/InfoPeersViewController.mm | 2 +- macosx/InfoWindowController.mm | 18 ++-- macosx/NSImageAdditions.h | 4 - macosx/NSImageAdditions.mm | 23 ------ macosx/PrefsController.mm | 14 ++-- macosx/PrefsWindow.mm | 5 +- macosx/TorrentTableView.mm | 5 +- macosx/TrackerCell.mm | 19 ++--- 85 files changed, 83 insertions(+), 692 deletions(-) delete mode 100644 macosx/Images/Images.xcassets/Bandwidth.imageset/Bandwidth.png delete mode 100644 macosx/Images/Images.xcassets/Bandwidth.imageset/Bandwidth@2x.png delete mode 100644 macosx/Images/Images.xcassets/Bandwidth.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/FavIcon.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/FavIcon.imageset/FavIcon.png delete mode 100644 macosx/Images/Images.xcassets/FavIcon.imageset/FavIcon@2x.png delete mode 100644 macosx/Images/Images.xcassets/GearshapeTemplate.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/GearshapeTemplate.imageset/GearshapeTemplate.png delete mode 100644 macosx/Images/Images.xcassets/GearshapeTemplate.imageset/GearshapeTemplate@2x.png delete mode 100644 macosx/Images/Images.xcassets/Groups.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/Groups.imageset/Groups.png delete mode 100644 macosx/Images/Images.xcassets/Groups.imageset/Groups@2x.png delete mode 100644 macosx/Images/Images.xcassets/InfoActivity.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/InfoActivity.imageset/InfoActivity.png delete mode 100644 macosx/Images/Images.xcassets/InfoActivity.imageset/InfoActivity@2x.png delete mode 100644 macosx/Images/Images.xcassets/InfoFiles.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/InfoFiles.imageset/InfoFiles.png delete mode 100644 macosx/Images/Images.xcassets/InfoFiles.imageset/InfoFiles@2x.png delete mode 100644 macosx/Images/Images.xcassets/InfoGeneral.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/InfoGeneral.imageset/InfoGeneral.png delete mode 100644 macosx/Images/Images.xcassets/InfoGeneral.imageset/InfoGeneral@2x.png delete mode 100644 macosx/Images/Images.xcassets/InfoOptions.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/InfoOptions.imageset/InfoOptions.png delete mode 100644 macosx/Images/Images.xcassets/InfoOptions.imageset/InfoOptions@2x.png delete mode 100644 macosx/Images/Images.xcassets/InfoPeers.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/InfoPeers.imageset/InfoPeers.png delete mode 100644 macosx/Images/Images.xcassets/InfoPeers.imageset/InfoPeers@2x.png delete mode 100644 macosx/Images/Images.xcassets/InfoTracker.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/InfoTracker.imageset/InfoTracker.png delete mode 100644 macosx/Images/Images.xcassets/InfoTracker.imageset/InfoTracker@2x.png delete mode 100644 macosx/Images/Images.xcassets/Lock.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/Lock.imageset/Lock.png delete mode 100644 macosx/Images/Images.xcassets/Lock.imageset/Lock@2x.png delete mode 100644 macosx/Images/Images.xcassets/Remote.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/Remote.imageset/Remote.png delete mode 100644 macosx/Images/Images.xcassets/Remote.imageset/Remote@2x.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/ToolbarCreateTemplate.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarCreateTemplate.imageset/ToolbarCreateTemplate@2x.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/ToolbarFilterTemplate.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarFilterTemplate.imageset/ToolbarFilterTemplate@2x.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/ToolbarInfoTemplate.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarInfoTemplate.imageset/ToolbarInfoTemplate@2x.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/ToolbarOpenTemplate.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarOpenTemplate.imageset/ToolbarOpenTemplate@2x.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/ToolbarOpenWebTemplate.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarOpenWebTemplate.imageset/ToolbarOpenWebTemplate@2x.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/ToolbarPauseAllTemplate.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarPauseAllTemplate.imageset/ToolbarPauseAllTemplate@2x.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/ToolbarPauseSelectedTemplate.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarPauseSelectedTemplate.imageset/ToolbarPauseSelectedTemplate@2x.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/ToolbarRemoveTemplate.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarRemoveTemplate.imageset/ToolbarRemoveTemplate@2x.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/ToolbarResumeAllTemplate.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarResumeAllTemplate.imageset/ToolbarResumeAllTemplate@2x.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/ToolbarResumeSelectedTemplate.png delete mode 100644 macosx/Images/Images.xcassets/ToolbarResumeSelectedTemplate.imageset/ToolbarResumeSelectedTemplate@2x.png delete mode 100644 macosx/Images/Images.xcassets/Transfers.imageset/Contents.json delete mode 100644 macosx/Images/Images.xcassets/Transfers.imageset/Transfers.png delete mode 100644 macosx/Images/Images.xcassets/Transfers.imageset/Transfers@2x.png 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 89dacb6104f97f9658af89c872808652072f8ec6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1765 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 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 77d6f02586806564d4e1c7e0fcd6df8affb0d7fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2209 zcmV;S2wwMzP)oWf(o(wBJw4jv zGoSCD@3d9jch8d~&Hr-;qH9|09?O?+enn@;lfM6`$Gq{-^PcUWb)8S> zx&LGD#r?Vkwg#^6BZP!y2~;8DdI9qbWn@`G(*&v_SS-Tn{*cSI9^m+%iv|Y=|M}LT zp}kwF4>I*(_3F-tY~K8`U-;&OdxF+A6pbParI6`j$mCMMqAM}9=rNY}8JKp+OA137 zkF5tLx%$*R83*#J%=r)8!sbUjv#oK(lYartPr6+K@pxlLOUskKnf1F`?Y8qce^V2B zJi$~+W-btv43k-3WjGUZ#fc36-apCEf`_LXjO9Fb9-gFs(I*?g;pq(f&g7UZu1=fr z2Y&~edTvX=>gj&QyPDe`(cRMB#flA0WL-hVRTwM6cwS~QCowSP@SBSU*n0I4MFftl zvnOg)5ji!Q=O;T)^S9lD{B8R#4xSre(a=b>JanC+wSNMzxj__ekXWqwA&Jx@zr5>M zRyjR9gSLDb4b96yk&qObK!UR4Aw;yit!WZT8xNU=hB%3sNjjZmvFy`-YJ#ERY4T1; z*#kH5St^u?smXRV$o|)HrcO|c;QHu6u;Qgh26C$3(oEQ3aOK`Z=&NFMbgaSyJRfvT zA(V&)bciQoQB#HJCB;bW(9j$uS&QDwEcr4HGUzIVKmeL9Ve9vOT|R&0UqJaLTM*lb z=zKaW*Aph=VCzVYF{X1_kf7v1z680FRHfue%;a4%MW2a`!(T7$U)@0?Pnh4I`m|eMblJ@+HzKi$qK#W~$gXLSPvx!cy@J zg-j?|-?ildbpo=!;y!XLS#2&%fo%w45y@1HzEgt?%}hl?A+`>C4xQ%TJN9v+Z-}ME z0_kKdYOF{1R|INUB9c{!M-s7$L`3W6HhLb|O)|ZDQ@wzhYSkJVQ7o-G^T@n9n~Fq3 zBFVssVFu5RlQaP*prv^gnb{&6&P%hQElp#}q$W|BdF@%LHm^t|BJ&5_rxjr*QLNa? zdI43FBq1YI8B13pDoZD7&pNtnMk_HvZ{Ii%f53S>{(-Alu{^=tbPiSVG3<)8hE-Yi z%Jx<2bgeo@^)p)`Zb%4CM$vSsUO);)gP@GA%b13WQ5(cGG^~hN%qEdo#)-odTypto zj-8&QyCcP_~rV(Lc*(SDa5l-cu*wE}hvUmGUJKO6Wqt(ADbl znWm0qRvSmy5fu>?D<)`bO>v*~acsb%h79d3I!}L80}qNsmNjVAvryRrL$`@1SD=ce z%cvJPd&-^f+ZyKb2qaWRL9d+w(=s9v1Iv;zZKCE87L+|WH#&;}m^Z+dU|m|}-dz^y z1|3}!2xNkC9xpe(J9qZ<{yG7m>?|Dmv9mZA_zp;tgb*6Ksz>%3hCw6(mVG^D3=Z}+ zqPSoJMhy+nf&P=@%uJP#B?Ui_a0?mS?7(;7T&Z3FC`|6TyfAa*Pld&KJO@BVRs=#w zXgcWEVo(!;ShK|6uK?Kxo$FD7iD?%rk;DyUmhu^jb3>O+jO_b6H;CZIDJ%|O__@UD z*84QBTDIP6OoAjK3otaWjcWvih)@6^ZbGPm5rPDGfaAa)cZN(l>jY!nuRn-gNx$U-{kb`cAme_m8dP2Y>(ass4TErY0xI7DCFU+TKdF z!zM+@5emem>t`}H7qYt#%m!GPn`QP)@A!D{j#~3O_O)DI)%Biq%Qbbx;M!HT^aPk`|mCfy<6UUSt>2&fMVa7&+? z`I(u*?1{a*a?|I|E@pGdtZS}WD!2rmk3fo$!3#+$B?dEqx3`S=Uo^_ji*eb#$_xq8#%-md8FPpH&XYhgoeEbWeLfdUwS1t}YZ zh9*=(ML-aN1jq3YSiU_;}S5vVg6rm00000NkvXXu0mjfh*d!3 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 77d6f02586806564d4e1c7e0fcd6df8affb0d7fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2209 zcmV;S2wwMzP)oWf(o(wBJw4jv zGoSCD@3d9jch8d~&Hr-;qH9|09?O?+enn@;lfM6`$Gq{-^PcUWb)8S> zx&LGD#r?Vkwg#^6BZP!y2~;8DdI9qbWn@`G(*&v_SS-Tn{*cSI9^m+%iv|Y=|M}LT zp}kwF4>I*(_3F-tY~K8`U-;&OdxF+A6pbParI6`j$mCMMqAM}9=rNY}8JKp+OA137 zkF5tLx%$*R83*#J%=r)8!sbUjv#oK(lYartPr6+K@pxlLOUskKnf1F`?Y8qce^V2B zJi$~+W-btv43k-3WjGUZ#fc36-apCEf`_LXjO9Fb9-gFs(I*?g;pq(f&g7UZu1=fr z2Y&~edTvX=>gj&QyPDe`(cRMB#flA0WL-hVRTwM6cwS~QCowSP@SBSU*n0I4MFftl zvnOg)5ji!Q=O;T)^S9lD{B8R#4xSre(a=b>JanC+wSNMzxj__ekXWqwA&Jx@zr5>M zRyjR9gSLDb4b96yk&qObK!UR4Aw;yit!WZT8xNU=hB%3sNjjZmvFy`-YJ#ERY4T1; z*#kH5St^u?smXRV$o|)HrcO|c;QHu6u;Qgh26C$3(oEQ3aOK`Z=&NFMbgaSyJRfvT zA(V&)bciQoQB#HJCB;bW(9j$uS&QDwEcr4HGUzIVKmeL9Ve9vOT|R&0UqJaLTM*lb z=zKaW*Aph=VCzVYF{X1_kf7v1z680FRHfue%;a4%MW2a`!(T7$U)@0?Pnh4I`m|eMblJ@+HzKi$qK#W~$gXLSPvx!cy@J zg-j?|-?ildbpo=!;y!XLS#2&%fo%w45y@1HzEgt?%}hl?A+`>C4xQ%TJN9v+Z-}ME z0_kKdYOF{1R|INUB9c{!M-s7$L`3W6HhLb|O)|ZDQ@wzhYSkJVQ7o-G^T@n9n~Fq3 zBFVssVFu5RlQaP*prv^gnb{&6&P%hQElp#}q$W|BdF@%LHm^t|BJ&5_rxjr*QLNa? zdI43FBq1YI8B13pDoZD7&pNtnMk_HvZ{Ii%f53S>{(-Alu{^=tbPiSVG3<)8hE-Yi z%Jx<2bgeo@^)p)`Zb%4CM$vSsUO);)gP@GA%b13WQ5(cGG^~hN%qEdo#)-odTypto zj-8&QyCcP_~rV(Lc*(SDa5l-cu*wE}hvUmGUJKO6Wqt(ADbl znWm0qRvSmy5fu>?D<)`bO>v*~acsb%h79d3I!}L80}qNsmNjVAvryRrL$`@1SD=ce z%cvJPd&-^f+ZyKb2qaWRL9d+w(=s9v1Iv;zZKCE87L+|WH#&;}m^Z+dU|m|}-dz^y z1|3}!2xNkC9xpe(J9qZ<{yG7m>?|Dmv9mZA_zp;tgb*6Ksz>%3hCw6(mVG^D3=Z}+ zqPSoJMhy+nf&P=@%uJP#B?Ui_a0?mS?7(;7T&Z3FC`|6TyfAa*Pld&KJO@BVRs=#w zXgcWEVo(!;ShK|6uK?Kxo$FD7iD?%rk;DyUmhu^jb3>O+jO_b6H;CZIDJ%|O__@UD z*84QBTDIP6OoAjK3otaWjcWvih)@6^ZbGPm5rPDGfaAa)cZN(l>jY!nuRn-gNx$U-{kb`cAme_m8dP2Y>(ass4TErY0xI7DCFU+TKdF z!zM+@5emem>t`}H7qYt#%m!GPn`QP)@A!D{j#~3O_O)DI)%Biq%Qbbx;M!HT^aPk`|mCfy<6UUSt>2&fMVa7&+? z`I(u*?1{a*a?|I|E@pGdtZS}WD!2rmk3fo$!3#+$B?dEqx3`S=Uo^_ji*eb#$_xq8#%-md8FPpH&XYhgoeEbWeLfdUwS1t}YZ zh9*=(ML-aN1jq3YSiU_;}S5vVg6rm00000NkvXXu0mjfh*d!3 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 e2062d4570bdae8aa8d9cbb8986b6fc3a7aa6817..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mnmk<`Lp07OCrAV&9QYv2@wL!X z+gK)9BjrWf5B`=|hiidssy?pA4_rF&L1Wn>r4?7i+s+4sF)oX)Iw16yXN?0#V!5%z zBCTJXV*hwT7?{@Z%s=pF{tc1Z#Dr$8Up>AP?XJZCbx7rS&2u3(wCCXmC!hPW$2ppk lZ!m9e2uKhT)h%IU5SIvC8Nd1aVxVgnJYD@<);T3K0RZ`XM56!z 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 f704a671b79a01506c4f1396a37ba562f0f24239..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmV-j0iyniP)JA`l;NZ6}^Tj&AeBXApo{Mq+lY>5Y~y5p vt@X%0A&pP1wn?bB+5*l04}M3-_>b`pGpI(WhSG~j00000NkvXXu0mjfj69mx 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 007009d8051963ccd80127537d59f0efb58769e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1278 zcmVFCU+1e#!ZoD557wk(m>o~r}^p(%Ltdfo0*Y3x!gqh5yLuYGmAMFE9 zX)@$&I(>~Y@$gN^uHLxlX~sn_OZ<2evmjcp^2Q8i)6sO=Y6G2gOG#|(92-tvZJ2-2 z0R0;?mKcEPuD~>xxS9Igj0q1yFzucn#@+H2_+Z*yUvO`VIE(KcGnq{XU3Ahd6{z2S z(x6>8u*uDciBEv>)_4qzycL2YiZ57-M*!SC1Hn3~_=vM$-m#iN2VHd1Ema@6!e#d5 zFPQYej1l)>mEm_S=zGQkZXT3IEAf#a^gaCrBg7rG9J=VFTdFf%HqE&iih(zw%77ad zbU)#V1NYw`X6+Yy-H&_nj;5?Rw?a{8hHR9oPnJ#NE(D|3WuT`9x}FX}=PmaU92WUq z?iU=64x8`uOj8D3<1YrI`eeOHD%F3vdw2N*x}7nh(>bWp@w5poc7MRkLyy6-SS%PP zKS0a9pV8@zSyKjGbkZ$ls?>UU?fKWx=}<6QpRfp^O3TCHsJqq$+poRE+VcwPtv8_M zkw{H%>7a{Fx}`)q+cJfEt$bf==`%Fl9f&6TqtN6KRIs3-9E#fO-=X$~_o5Hup6WYh z(?J)VbW5VL{Fgj^n|$3?eke2L3aTuBjT#%gQDdX8bvF2*`g$+IUiCgRnN0^>bkZ%5 z90mCj>TK(!F4JmDu8vFJ9eV6AJ7EX$0B%J4gFu#eO9T5+um`H9NJymd z0<-B5E(4u(OEyXD97i@?Z8$K+4G-2B@o=6652gVRrpC{G!R<+rxHQ%em&W+vmgu=> z?F}=TO$S|c(k<02(0Io8C8t##hw!Wso%i@n%;C(cZoGU%d{ zZmC?V*2||9xqwZTKjT0(GY(dVDtoGgVsYt5P_B8vO|VGx+|%-w4!Y>1Thb-8Ez>2# z%J(z!-odKEAF#D(D0UaKU{5i`3(q$d4#0|Xu0-_y*rnkOv+1CVPP!#dq-2THx9OB} z<%dz}&tZDT$C#T*!Mw}{tIWydhMAe35zNtWpP9_2gDyIwO~WJ!Z0nV>X|<)T!_qf> zoMcm9Cp~^8%w#qlbkRw-wP{%Q*YbTD(vh3anA6bq>!iy5^>_JyG0bFk8i8G`X(%cI oeoOKb6#un$jUQP5=M^07*qoM6N<$f>C0E`2YX_ 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 2c26daf52ab3f4da22aec4d57c5822ca947df0f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3366 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 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 23ec0c6d0471cb5133cbcb1e04627b02f0420942..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)S@*ct1VNf9xN(!SHA)x>+fHD z^&24KQvc%o1wa%WGoP7Rezmah%4a}ief>+Wd;tUtm*kHD!OXb%$}FDYyTX;ZN`v?{ z(`vONW~|?&UOqEpej~VY{s0h}>tAy56CmP@6Pm9HO>1(?geP?QO+c`4(fJR6VBsS3 z6&%ZN0Yd)ykAR?GExvN<8bqtDPRiAmkd{aMmHDg_@26$gBEc(H^K*dUzc0+s10t>T zFFf@g5X_94KPwZMkcGzqk)-_#OsjCgiFW`|aHJ>`ez6nRAbw>&TS7W1xhC-|)2o|r znefW)(0xF}3E#0jfbe=RAas;N514rfq}dEVbmjf$0pUyP0GXv#xc>qmd|?A1;VY-v zK$~>Tc#CSxk6TwRb-5;Hpa|bNrq=-%%6LdnWc#l2Xqwj bCwqPX@^FTV_9#I=00000NkvXXu0mjf=;Hk* 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 ff1cd60d925aa0eff7f851a6813fc6cbd6c775bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1124 zcmV-q1e^PbP)DB#bBhXGZ3q&13vaj(FOCRPkAi_|#(p7CessgYFqVEl*}_;{3XRYRnqg zks}Dh)3bWQW5(Q0-^(*oVrIs?$_$wq^Tf<-hi1x+k(rrEupmvlNB7s&>~3$>=oERY zT2uG!|NiQQUp>0xRE~849^arfuJ&ii@UyoP!!>R4@5ird-1-kquW{&|+MptA!yq*3 z8Rn#JVfw;J;XNrfta791+fuodi)pa07_4V@NdqT^52Tp6#y6lrt?_B~3`uEMvPEi- z)Ml{1rG7{ATctLD{{!y8H-i5q^$YI*cKA@BH-QgJ{VDZ5)*>n-NxN;?H-vw>JSSrW zwA+a(bH5TLC2o0^!>5z5Ve46-H_-cX#*pYUH6$8bk=k&{zx-PW?^#cKlTIhO@VE4v z3g1Vq4z1phejD<4uA^PD@Fhe3xujo5`~13gD}PtgUrYX}{aa19b_bnQ23dGa{CzUB z8XuD(tGrXG6e~Vs|DpKgQXKs~$Wsj(;-Yr%XfLq~) z4|vgh7IRdJ(e#G3^ZEBu`W~b`lys8SbJA}sd~YJno&IE6nyrtWL_6mxzJPxz=^voI zeii@1zkLJ6PG&;qj2A)Ny7(-q^8n~M*@3YV>Hd8gN33&K&41^Ph4H8nX zH#lf$u!9sYw4>g%M2dr1j1=oT>M+IeJ8Fv^@4=n(EGMM6#M#ZcQ8;`$!q{^Q9~0`4 z?iRZRcho0d#lMBB=WnOIWIL_ZBP%oaCE6$43je0Uclq_CYs$0ux!bU#KBlsxesQr` zobkAxN~Bohr0`UVUEN1W&;}h^ij5oVeBpGDYKWj;az{O3SKm4N6sw#R-t`|=NPVg;fM%HE;X!-r%7-Z3h)Vv z!Drw@gv213jK3X2Z=j#z+_33qCpG=&5#E)RAOacm?SL17aVNOo0(t{p^)ZTmj8&N= qdXqLd&nN>H!(HGNrAPh0j{g7!+9YK6rLsc+0000K3*nkicm`q&%J*e8C+0rmP_UX&3v9dFnHt61~ ziIF!2EwJ6Z7Y`g#wKZZ8nEK54VFrkI15Il@o?X|1p!e$H4)RlTCwov s&Qm>pl#Pj5Fsh7v%hFs$MKY1%7kJKWX@qADrT_o{07*qoM6N<$g59K$Gynhq 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 811574485819e432efc7397571383ed6f4b6fde6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 549 zcmV+=0^0qFP)d@3HXkHv-oH(;X$Tto4c-DKxu@tA#RB6aWn#VuNGZL^!~ z>~)btNs0U~w|SR5+v7GCb-91+`CA3!VF6>7U-O#&F=A zpQKAw2Ga~W9GH>TfKL#ZD;f;6iQNrjM&i`1;Mf)YrD4(Xvis@xQlccO4l*d2ee4l nMU^+d(w`Pbmc7UHQDyZ9{QJA0=R4Ru00000NkvXXu0mjfsA~Zl 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 8f4bf91c5c066d9f13a08185b9d9d9aed94a02b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 879 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 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 136823f57aca75e77c9a1f7ab70ac502f812de40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2430 zcmYM0dpr~R8^^Jel1m}C$&Ly;VMH;vDV4MsMUgR%T+3z2r7`kThgy+bj{Cjba?9pA zV>YU&2kMH;U-}8E&*XQ&8JYU>Ra}(jCz@t1oJi_qnS1k|T z-@czC{0Dc`eyukTkAN}!s?lxC*lIH1p(0H(((#cq){9o{+hewJ>mh@*6|Et|?<_k~ z?M00tkOeh2l;`0AdYg!&2ujAGW^K+NH^)}_nmA1ZaRM_+u zGxWK6e?|PXw(GvJN(_wsXL5?4gG(gH4_ttqJSAR88MDpLU)}GV@7)ks7>62SSHtO# z8@?`o#2UV-G64mRG+Av^f>q@)uKU*WA`@TLj`-SJxB9{)7sUHrrR%zHz2ZlDUzho4XkAv*J%-#G<{Q5`ym*vzWG1vG>uIgmG6bz(PmEEf`m+S*ftLh( znsVVU*jSwu{4!|60S@^0y-?$Z7pg5m?+~^Nhqu$e@MzQx z-t3ZwT%eF=`Z8fQitQbv0lO0V%$>5S{xkR)vXl!0p}wGbQ8_9c(+5!(sLTQ<0m&ZO z5lUlCTvcFn5a;odcmr{B;e&u*Zif9hdwIOD%UXhNU9qfY8)k+;hd5L_aH1~AJ-Lf4 z3%*h9$W1?Ym{e+WQ4wJRO04$Gl$YpG3t76E}Cbt!|b z(<6NApz0#jl_{-)77dHd z!vlDeAO}2thndhB8fX3Zt~LmJclg(!o1HauRhj6vcflia1CQor20}J8ipGNKXVFBm z(x3W1;*W}QB!w&cugV^4_(GyBG&B8$^;CGnQ5^f@vBNu*jh525+aK+K$HrCCHqChD zOK8ts-rFKqjda1?r?0ei$Ckk&j|x#R@Q3)4qA~F78`Ef80HSjJzXx4KgI3Jz8*XH4 zj(-Nr&pzFG3O#dv*wm}n4JKaG8Ts~@zzMI08|NHRc!W|n@g~1en({dhlK+R-CKk5J zDo2s+d1PdaWU9wZxKt*FhIAtaTJ9zobqcvlZGVVpKHK+4p7#3=hx>Z|O@k{$lw}ze z0?*TTnIAYJ1KqRVsq|bs<;{+JBSdm8$l{2$xv7f$Z&o|#*M|*477ZEZSbkP1X|&ub z1`fD}KxF7}n!#Uj;LaUJ&HJ4Dq0 z?3$SA90;yPQ%fQ_|oJd=cvdK3Fx_L!(i=1 z>7Zdfg5-gtBf$ND#(pc#UY}igp2n?2H8Z6CeP+Z6 zL>T@=!ys>(^P6e3i`L0Fu|3j#;z^uwX6h{+YGalV_@`1!YDnn>4(t-(L^wCUUbQ$Y zZaEy-S})E>ZyM`TFZ}hm6x5NU)CN2@p+0MQ1pdU>Y>_?2_=Iy$tOauz{{v-R9>Hp_j$TKR^?P6YyrkPBs*#ZpXMajcSh~e|Cbv&CphFUO24>!7`%9S~pn4tB8`Mctj zT_+TavlNw*fDdH0K?Y^gKlZGcB%3UAb?x@CpW~7ggaF zn^Qh1)e6(b~-sjem3HGuf6yzZi;<9qG_< zeZ4-OUKHit+f{DmQqDW`&YfE!Pcr01&FF}Hr{bGO4sOeF9WY>M^$%J6`G>=J4s^Jp z2J}ct+$!JWwer;zN*A(^<|oP`cr|)zW1Y(?_5kyaT<5yR#g*XS9Qa9U^KRX{pw=e9 ZY3intl8N>EgMSqd+}QkT+2!A#{tYJC*^>YO 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 9d68cb56413d1dd8fff11f0b970e137e93bb20e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmV-U0kQsxP)YH zpfNBKvTk%aV7I_5k%1A9GIL?C_sRd$fH3;MQxk5bjLs1W|C6CG^aBGsE``jl@$vr? zpfKt`g8(iwnLUGIfR;jF?0*JfTnd>&0;B(jL1Dsw1|ggZgPmjk2S8!+M?4A{MDzD~ z{RhGD|LN@ve7F=cGH}O~dH;6-!m$5#Hn@Gwz`zHM*IJ! zP-y$XZIX)-n&pN<<`c{w82;BqgU0{OE+9uHv*sqX|Ef5k`hTrvm{Km8|FU?X^kD`z zh+p}6|MUOn`!D!k07&u!X%Ga7Kp^)~1`dcqUIr}&3kFLZ(3C+QVj?h582EwlDuM$F gGjJmZHGT*L07W95-l0pma{vGU07*qoM6N<$f)W6YRsaA1 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 30b7b6cfb17e28eab90b06085878fbf51b46d992..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 755 zcmVy}R~kOM|VYKvf`u6i|M((uM*pwuNGf6-xOj5CRn)#0Vxt6BidJ6CHGM z)5Ms#7!n6JU5qg<5(lD_lXIhgz~cacE3L>Kj=rDe?uKvPH+T2m0slwQAs`_BRZ42B z^R4(+I--yv9WE;%wYq}ux|n2&Q3e@Y?~ECb3dr5ro{c1zc8v2JyR%S?Bn9Nwig<30 zm-8$#&Ojq%{YeRG?A|D|1;*I_94aKeK?SAfU(9l$z&wX?uTPWs955N#5haui439IykVcAQ zZ%}4r!BVd)F?sPzguy)$Oug>&9{l?vARxzL15Xo-GDLq7VGc0yIldY?`nRZn%Ai z={Bs4)(mWrcY`IURH)KSg$fm_RH<$sD>QGPZ!zs$*OJFjnjdtd2|@HBs@pk)a0bU= z)dtOQpcc*OfDe9MeCR+6PNH190}05mzyUWr@Zgv(9(Yg*Cv5poqJRPw7T652LWODX l4k;i(f^3L%*gxBS$8VZqUOZ;tq1gjP`8pTEholz}3P%Y{dO!&Y01j%iXA->_J@%Tkv#b!kPc+_7d^M z9%syGuMS?+!A1D^HDOUlk6}*ZYccF`#y7Lv;cncAIfL`B!T(1I0x204Gt6>l)R!*6 z9fPmty`XjjJmK3sn&$#D$|^Vd=t;}8_{H(j(V7-uQGf>7p|nMUU`zgt_e3#g8ZYq9-IXL6)KQQ3kFx-hDa;MJju75iUOCoxH;Vzbi zA?0MW!Z0LqHbiHwPK^`{S*K?LCjNh7KzQze5|$e9R|O7oihl*eq-vkyTrLb>IXwr# z@M}3w@v916?i9ZbhJ&kpljL$?xXtOg9EMlR8Spv zFkDy8fO{+W38z64-@tHC;R@$@`A%~=Fx5ypJ)eMK?{Wt0g;r!S!D+H546Rt>r22SX zd?#;>atwPq{U)eaD|(gtQFBASm8;p6FdX4rZGg!JC+BeGTv_BLbweeeg_F>U3>G@g zLR^l1PTEZ{xyi}ttDMm3vk)2enpEir_Qf!~j~*q$2ciR=(xJ0r^?Rtc;o@q(QPOxD zh6fNU5`Gd4cZ%uED^NS8nx-DTdlG@MiTZDcXV`DnQXhD$LMvv3(qcR{4i7}a>Y zs?C-0n%v*n-Y|5)&wnQBup`JW|s5?_^7kJIu z-UxIcgP&me=q{t!k?@Rt;z>M#$MC4*G2K0>*o<<=HDZfC;y4S2XR!m@unsG*6iZ~O&ekbrhjL6c;_&Oe zy{`BShBMHDtyqsWSmjuwyKRa+6Q&y75Z3!^tuNlj2iUCU%drRx^3mOL#comV+o~0- z*V7yziNTnO6>2&g6EF%R#5GDWvz4sc92*@Ljw~7J^)kD-rk)vWy;Kt6DLl4K6&!Y_fw|Kc+}R` zWe-vFAG;x|R;^+N(cRq>{ehbQb#(N`0J&TN0RaO2{gZluVqZ&3Yg7rkq_1!C*~yb< zOh6Y0y5>00H7!sBSWqPY|NqYjqBAoy1t(9Q{-L_MF&xCt&CO*8D&_#Or%jvF+tV{) zJyboq3lIiOnl$}wQBkQEx(jB`oZsHr*|!<10Wd!$Cuhq81MG8UWo=DDLV{^dPJvTi zUXioAyRQ+@;FaCo{l|dH7?EAg023%FDdCgVp~tXU>!ZD*O%91l9neAsE62845BS$ba0|*T)IB9A?1m*|TMUl3!-c znh#R^59R_Smw*kJK7H=(Nt3p*V;C@X>O5JXqOULm5Kf2VzYy=uyEA|Od=Bax0P(`S zFHryDGyv#L>|Ou`B2e>BkPFcLj~oU-8hap?mzVPclj==KK+Qq79V|9)-s1lgCQR9g zEen7RNlZ+XO;6AA&CJa8M#mW$**+N=IqvG}>b%H$02uj&xBvhE07*qoM6N<$ Ef~e2tO#lD@ 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 7fbcb55d10be769b17cf556d4491de63b61d17bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 811 zcmV+`1JwM9P)anD!XW2J4 zwjG!^Z}Gobv*!PY;kk1c{hvB@*3Y7%vIbXIcOjs1Mrzs(@)%=kYDU5I>2p5Mm@)VF z?AZ(cO`0_Qb3;Sx#rF1|2Qz2R13LsL|9k4xndd`8Bc!NiJ19sC3rnMbmi`A?{->{R z^7)vUxM*>4aRF8!UH;8#Q^gVe{ZlSZn>PD* zOH0R9DJf|lpqp5bf*BO=V0LC^ZrYqV3;%&|VPQ!nRl?rU(K!(4^S?7^&i|5|TWF2T zS0G35@$s?M)itdHsh==m>Y3o+aAt}fP*G8{2N=iyrcIl53z*Wm@dYbLuArdA0T>Ox zrc9anIUym1ha$^GL_|1ydnY{r2I>F&{Nlx2TwE-K;x#HNP5~GKuYl>{m$kL64cX}c zq)}d8QE0-1DbGO;NJ>iWV_{)oB4l82aG3b4Sqq+k(u}>mV<;?rkmUd+B^421T)qG~ z02rJ-pn`}%9%l>;3=s$B7_b8z9Gs%aE|_pRfKVEsngc)@m6cV5K@I?wbRY)+qX6gz zW)`3nGd2tY$PRFHq`(0n-vYCsIk3e004jva%Bptz`v>Ou`v>I)1b}cb2RYIiR?>ToRa%-vNE`2V@Y1_+NK-{{fO50IX0H zfWi2W3YNq0MUor<)SyU3%SRnB>VQ!Pj5=TlI$+wgIf}3fWk4KIU*9YPtO-9;qdowc z0qjd0A;|&2b^vErSN}R-Z|5(t8YUahnX~8*uyOht*jDf$t3_mOZ5JLA65bXT7S%;M pj_maI_NxH4Ez}3RSB@$Tq4j5G(MOTdlSEwD!KN@wB$BnQ7a$QMPSgWyWUZFCMaer}q~R9MNwIAx6r_T|_Arck25R_~zT+{&t^fnj{hl?gmmyEX(qp zJbCh)67V^&^o3>g_xE4!5;O`0irYd)Mh5G*tYai~iKe%=mzB@Fhj2KADNQ275rzhb z7#@na^U-LGcq~pLp1`(kEZYJv+N{?yK*$#+#h-?kqcwZcX(REV5;pN@9Lo{0Vis5+ z6c`9h1hz0xhJjEZ48W@>bV?oqGC-<7o$Dd-V8s%|6$l})5*D^oSPG#81_pjZGIR8F zresehFE!U0S=bdFhz`=$-$qq?4OJagSjxt4_(%IIlMKa%-k^cF1qmC3aF4TcYT@VwtXRB^ za4_tOMyv?sE#)+HHqblV2S8dVjS1P~neL=BF?|A$&wY%K4t$v3@Bbqws!t|uz!kTJ zKtHSU&Y|S z0Q)ZP;dse0KJm;ad1&TCNNHjUk(>e37N8BFVAGlPRJ4^-SXWlFSgBKrP z%1ckag76EJsc33%q@}eP1k9W=3z;IBJ8v%En*LqZZd=91z3Uz0`JT}yVZf)IDz3b? z(^Jz3rUl6_JI~rpt7vL&1aLiM(^g`&c-8F@b;|dAV>>2^c0eA(L@vhgt9}VXQf}>{^k-$hE4x` zjq0*8icjZ*fZ1=JPtl1B-u8De0Zp+ZsG;;^zNhWY7|_q?-(P&4yMU`DrSuwrjoUVG zFEF@CEGxnKzkQikfB$JBLw(#VlAA;bL0Z;m(v-j#2y?THycNgpyYD`q19y{nJdX2H z8h2mI0jKbBcZmbv$1%Xfi4z52XcJ)|2bc^j0v-mQ1zrMPUbbx6)*t@xhw5rIvJH4y z@B6H7y9k)9`wVLhV?@&_Gbd13=%@#4i}XV0F^)rdx;V>fKr zV0)ftQuh(p?KLPz(*lrMTql48{6IiY4c#yfSmVZxo0^)MI=`;2j;k@UZJa|>Q&Tly z>oPojCV;q}x<=(yz7v&46d(o|?|ILAKEHJ7()URzO~Wt<1OoW|egGno2mrxg(D%FF z{qFbwb9nXDSAU`Vu{;T=%e0VaJUhocCyA+d7MnM3{^h=X`~GE`rW8Wp7{R%6On_J{ zW(gr&L(XAHbUOfDT2OgR#Pqz4MtG)%7Ler1^@s6 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 47451e86dc6ea66849279477b03c17cd317e1edc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2890 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 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 8393ee0084a87d17f18d8f5b7ac2c66bc8f10d73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf60zF+ELp07OCp0jyi<~&o!1!k4U^`0({As)xyUN+=9pup4mP=0xz ztj&bQ%Re~ThMarQ*cIE=+B9j^mgcjwjh-|+Fgc$NO)_y jdH%}ZbJJP&tzhPQa(Hv(x--&1r!aWB`njxgN@xNAHuy(O 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 b8a1a6ebdd9206c606c73fe661077480a6072189..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh0wlLOK8*rWZJsWUArg|M2MxKJ5*XMns9%xW z!WMgCWAT-1mqd1zbiGjHyLVDvX`fV(${X8f*Tk+`H7_dvuvkz~u+TWTd-}0^=Z*$n zQJb65b8eBbP)#N_-m z?-RWxwziT*i$s)7txB7g0`HCnu;4Cq?Tbf2g<3`-^z0*>POOTt(8`~ZT9D}&3frK$ zdx8_i$*ICgP_Bx((2I{&g1(777Bxe#nKl5G-hs~}_uy;FkoTzJAay(ZN4`1FI|BW% z*PN-O9TzqjGDl7O?t}ST4+HisG1vFhBW<*7j0Q-;+4!3_ARU)vTmE}I0fYAPSM}Wo QA^-pY07*qoM6N<$g5Z3R%m4rY 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 5700c33d4ce977e4b49f8c80bfd53975543a080b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc0wmQNuC@WG0#6sm5Dn422OlyVHjrRF;LPD9 z&=t_4D3Zuws&Po5O`t_dWFbdB+s|*S%WW3lE?KJg=$c5F;6|;I?G~m>)2>e0b$3xo zhs3g3!7eqvZ~2yYY`>(M6!=0ZZ>jH*3nszxg40i*z9Jwv`%pMfw|xo!PsTf0I$>## S_QV72X7F_Nb6Mw<&;$SwTs!9g 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 a884f587b4ac250143f7ad1d2748034208afd863..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmV+c0sj7pP)>uoFlWe3Y`sb^*za5Vlv zrK&o3`n4&;c*7mmg2!K1?Dn6!Qj_K_RT`C5b0eoGzIwVo*`=id9cCcp00000NkvXX Hu0mjfi^^*Q 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 9b50a0a66435c2b0342ea7a83788785f02757d78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6vOHZJLp07OCoB-#ao~eIhknBJ zlq3%Z@8$#rW^Ngy!y;P_FAaPc-^Q~jr@kljd%i}^fdd=Z+F1p5G%{xJ+p+HC;nAuP z&1jDKD6sqsH=EmpCRPj4HBCR11(!F;bTC=A7H(C*_EXL@Y->Pv`T=EytRt8U3 KKbLh*2~7ZAurxsc 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 7672a1057b0103e9936e9c0b4991cbc57730d0a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4U2R&UJLp+WrCrGe{uysrPQ$E?|o#t(t4=cWm=TWG{)J2D-An!m?wN%EELH$L-Bb>yGr)|GY6V-4meHX xz0o*Jee#KutS20%JQVZ1HQ!L9KP<@r=mQa+Z<~+)S^)G6gQu&X%Q~loCIA^_Uw8lj 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 ac702c08bf9222028982d391e269e39bc40a4f5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmV+x0qOpUP)z^c#zfT-dO0&$(M8aX)*pf`MZPR;@cxP0~p2 z-F#DTyZ0%`e|{hl1Y32rsSxT+x-b<4&z7yZ^w_W8u5VB@FC%5@dbDjPuG2hCU{TiR2wR#C6|#h+6}^T5u%vE&Q8~yWTkyilF$xI6A3iX|QzAro!XRHbK@bYW>cJ(k5cWtD0v@r( zI-i+joZpO)W)Hz4X^yKPEEBcAN7+L71q?7v8i=xuP%%Tsun^{G^jv+;NBdKX4qoyf zL9i}<@UY#x6=k)PF$VaDV zJ!hN;xERV>Y+?6`hi@-l1Gohe3Ky^G!O hqQ8c}BKL83;uHpz)xIW{?x5c(9i|~oMY4C`i3$O@Xu`nQ1V`0ENUh6~ME>1qL=i3^8 oKObOzGjHZgzViP67GX2Y|CnU{wwY*W3Um>Jr>mdKI;Vst01s9~W&i*H 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 5905afaa9aaee8d5cbf9303f1665fbfdef68912d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmV+}0nz@6P)kdg0002>Nkl{4q#+~g#>>G#Uiv=D%yYh;Jp-@e1#vc zHES1aLqJN#l^Zv%WTXUa?BFdi1)`aPnC&OrC)dK=0Cc zH*beO6#n?QPS1y4FBM~U8XoU);$?ky?BgrWvjt~XD%|(J&sHGpRhT#l5*21nf=q=M zC&5L9t&^bDg>wX=!qQ1lF8C8uCqb&hz)2AFE3B9;DBdeBo-K%nP1sf04(~N$%<^$N zepx605sekz5Sdyrve-p!#uupd1um8auC{-#JMA*4CaZ$bx&QzG07*qoM6N<$f;sAW A`Tzg` 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 d8572bfd5c73ee3fe958c6e09d998511b7ff4748..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh0wlLOK8*rW!k#XUAr-fh7fAeJcMQ3mdKI;Vst09wQn=Kufz 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 87446c48dfa78d2d2e97ac9d5e8e206bb2c8e174..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 87 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s0wiy+h|2>hIZqeI5R22v2@;tP?1he~o2@Dg kdA#CSVDFU+7B-9w?{wY^rWd=t1FB^3boFyt=akR{06@zZ-T(jq 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 ef266322edb8025c48582cda919a8bc7ee8c64bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6PJ6mIhG>Yg9yH84l)%7tVfuW( zLh+V6u0|qW{0e%O?$g)lMegqKW_$TA;DxKo@eR&Kt{-1lGcdR^GB9L(aqB+1;yMGv z8y_VlB{ge?8`T~1`PZ)9``g)Wd*GOg9plu=9W!zont!l{>~lGy!gnBa%L0q8j?LkP ztYRCTo~kJA6V=|xP#&n=r}XFz>((92i!*qYk^&Bd^*HF~0T~S97nyq_U3j=2IG>Sf zI2U|pOV-x4-4(AG78rMTbj&DaVCcPkdg0004vNklD!Z6ox;>2r#qk1xg5J3b#2FNfR6jheS2m3rx=<`Vb&SSTac_hL~uEVFt?s5HM6g zfKKdkZ@Ju-W??(mwEy}4+jCBP|H243P=Iq!p$HT=Yo%ERwQv$=9;+(Fh z%-AU2uQBB~d6i|XJRo36HA-H?m$VgqTHIk_aZigERx;;PGZ(MqJuEGoXBeu&KW^lL zkxV}xZGOqC*2sv9LrPPoo(wOwW0*xVOi3{j@SDDKggjtEN|7o8+;DqR{>4UIRTQl) zpl3~OIFWoStt}I0C;>x5@4Yxf0jRSMSz4C{MRMdQ(x4Nv wv^Di8SF9gYVP1Z;{0z2!h9Aorer^99-x%Vh28TxDwg3PC07*qoM6N<$g6p5cLI3~& 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 6a630b7c8d920a47367ac997aa501ed6fbde99e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmV+v0qg#WP)MBIreoPt?hNn^*cPchX4=rrrXg-r`sHxh*oFc9%! z0|47fF#w)LZ5MM6tf1d~j-aI!PvA=Ixt2x=EtR+dg?N*h3K)xf@GgxX5o2H|3QIUK z5w!>BB8EWMMBHj)(Uw)qUd2Qgpzl{a+BdK5&{)*Y0HCK3F;$89_P1DUk#!X_vM>P) aDi;8R({P5CPdtAB0000kdg0005qNklXCWpluy;T2Bjg#}7BvBV>foUqb4o~W zpHAP_T`r5TuEoWbBdNiu!0a*7u0%=YvIKl5CTN&R_LwN&#(h(=lt5O%eZis}${5|H zJ146$sqxHsO z2511Fj!}-Z;){$KD+Kx}csl<`R$Fu%n*u{YbTGZv-KWB99sc}b`LaKK+Pqf#JKB%! Y6M1C9Ql1S33IG5A07*qoM6N<$f>31lzyJUM 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 f4999debfb391c1f8b10542038ef58c5b1a1b275..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67J0fjhG>YcJ!t6F#K^#Q!Ci2R z%NEsphYHp#h_*1{5W2w`6Z1((wR3j)gtW}UOs-o|N7%L(1leVByzy^c@cqYT>GZN! zGgjYTwCZW3%k_m#!Tw50O2_opSbow{Qc7BwdViL+png`>qr+31%nb{B`X+8_+O)Ld z%hE>&^sDV$@AEku27h{cq*-21_vr3rtBP}jd0DrMDJea=$0o`wT%3IU-$ky{&sLY> T^%NHYUCZF<>gTe~DWM4fdgWE- 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 91d01d5f41f575fb5dd9cc0d7af74c764b52072e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)@+(JX?(VA~K0|3DoQh5&mtc1}R2W{m+3>Mlvz_<7foCy5ky3QH1_b zYP`cP7==sNjg{Ddvv^}T=L|fx1|<*$PtX9KTZ{~an>U5Fdg6f(Un3KTP#@(|9~{SP lgd+oS_<*D6h`Q?XxiS!d>J$ntxnKYQ002ovPDHLkV1oBHqyzu} 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 b4617aab751b8b8bce00aab9e2e35ff47dc10954..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 427 zcmV;c0aX5pP)w8a29NWj?k z08;m^|343s-tN!4cRfCA!~1;=n`7#XB}0v;QmJ%4pLcS(9GZxkgIk>QG;DJQFUBjC zieIf(Lz{3DwlmCe9Jf}hg}(1wg%OOg0?THzGYJN`7%+!#>h-!+DxmlsfFIaC+JN^D zx*(7vMGC;nHckiO=Gic^y^CSkdV1D+Y_%~Wdce_@B0z!{11_o(x#sQ_-EAVbZq+l4G1Bu z!p%PedV^jpA_pwqEQd>XD<!%YZq0h-6RfPukg8#7=7o8&A>3zvE?YMT?g|mv?u32ruyaa!7cRX_~Hf;1}>55{-S| z-ho5Ru+4}74%-adc49L=u!AFhzuz}KJ*`enO=%*swvCRC9<{cz%|j9^B*)|NyUAp7 z7fiwJT3fBnY`Y|*%5nR6H$;$SIlv-FzKMy6uyv45r_EZeCbV7z>{h@B(y{UJ@dXzK zn1ldGK~2+6yD&f)f*>iXs-AISfH??(6v7i_2d;tL5m5gNpzFGs&1QvW3ozdcp!Nb- zUl9G-6F~CAJrEE6{8 z{%xT2JwW7Tbdb;mIQ44D$>;;zZfrRjeSn)^Hk^z;z>QC9PDUT#`kPfJqYtpSeZtA; z1B|_xbTaw?v#&2W8vQHqZq3Q)11x>M>SXi*R=>ubj39vMzXiMi-v0q!fRKv=sBR7r z=> 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