diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 318fdcd3a..6c7d25a18 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -14,8 +14,6 @@ 1BB44E07B1B52E28291B4E32 /* file-piece-map.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BB44E07B1B52E28291B4E30 /* file-piece-map.cc */; }; 1BB44E07B1B52E28291B4E33 /* file-piece-map.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BB44E07B1B52E28291B4E31 /* file-piece-map.h */; }; 2856E0656A49F2665D69E760 /* benc.h in Headers */ = {isa = PBXBuildFile; fileRef = 2856E0656A49F2665D69E761 /* benc.h */; }; - A47A7C87B8B57BE50DF0D410 /* torrent-files.cc in Sources */ = {isa = PBXBuildFile; fileRef = A47A7C87B8B57BE50DF0D411 /* torrent-files.cc */; }; - A47A7C87B8B57BE50DF0D412 /* torrent-files.h in Headers */ = {isa = PBXBuildFile; fileRef = A47A7C87B8B57BE50DF0D413 /* torrent-files.h */; }; 2B9BA6C508B488FE586A0AB0 /* torrents.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2B9BA6C508B488FE586A0AB1 /* torrents.cc */; }; 2B9BA6C508B488FE586A0AB2 /* torrents.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B9BA6C508B488FE586A0AB3 /* torrents.h */; }; 35F373030C2DA89000DAA8F2 /* FilePriorityCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35F373010C2DA88F00DAA8F2 /* FilePriorityCell.mm */; }; @@ -272,6 +270,8 @@ A2F8CD430F3D0F4A00DB356A /* miniupnpcstrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A2F8CD420F3D0F4A00DB356A /* miniupnpcstrings.h */; }; A2FB057F0BFEB6800095564D /* DragOverlayView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2FB057D0BFEB6800095564D /* DragOverlayView.mm */; }; A2FB701C0D95CAEA0001F331 /* GroupsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2FB701B0D95CAEA0001F331 /* GroupsController.mm */; }; + A47A7C87B8B57BE50DF0D410 /* torrent-files.cc in Sources */ = {isa = PBXBuildFile; fileRef = A47A7C87B8B57BE50DF0D411 /* torrent-files.cc */; }; + A47A7C87B8B57BE50DF0D412 /* torrent-files.h in Headers */ = {isa = PBXBuildFile; fileRef = A47A7C87B8B57BE50DF0D413 /* torrent-files.h */; }; ACBE7A956ED89682EC4460E0 /* file-info.cc in Sources */ = {isa = PBXBuildFile; fileRef = ACBE7A956ED89682EC4460E1 /* file-info.cc */; }; ACBE7A956ED89682EC4460E2 /* file-info.h in Headers */ = {isa = PBXBuildFile; fileRef = ACBE7A956ED89682EC4460E3 /* file-info.h */; settings = {ATTRIBUTES = (Project, ); }; }; BE1183580CE160C50002D0F3 /* miniupnpc_declspec.h in Headers */ = {isa = PBXBuildFile; fileRef = BE11834E0CE160C50002D0F3 /* miniupnpc_declspec.h */; }; @@ -610,8 +610,6 @@ 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 2B9BA6C508B488FE586A0AB1 /* torrents.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = torrents.cc; sourceTree = ""; }; 2B9BA6C508B488FE586A0AB3 /* torrents.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = torrents.h; sourceTree = ""; }; - A47A7C87B8B57BE50DF0D411 /* torrent-files.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = torrent-files.cc; sourceTree = ""; }; - A47A7C87B8B57BE50DF0D413 /* torrent-files.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = torrent-files.h; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* Transmission_Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Transmission_Prefix.pch; sourceTree = ""; }; 35F373000C2DA88F00DAA8F2 /* FilePriorityCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FilePriorityCell.h; sourceTree = ""; }; 35F373010C2DA88F00DAA8F2 /* FilePriorityCell.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FilePriorityCell.mm; sourceTree = ""; }; @@ -1045,6 +1043,8 @@ A2FB07F115F8208300933543 /* nl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = ""; }; A2FB701A0D95CAEA0001F331 /* GroupsController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GroupsController.h; sourceTree = ""; }; A2FB701B0D95CAEA0001F331 /* GroupsController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GroupsController.mm; sourceTree = ""; }; + A47A7C87B8B57BE50DF0D411 /* torrent-files.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "torrent-files.cc"; sourceTree = ""; }; + A47A7C87B8B57BE50DF0D413 /* torrent-files.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "torrent-files.h"; sourceTree = ""; }; A54D44C6A7AAF131D9AE29F5 /* block-info.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "block-info.cc"; sourceTree = ""; }; ACBE7A956ED89682EC4460E1 /* file-info.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "file-info.cc"; sourceTree = ""; }; ACBE7A956ED89682EC4460E3 /* file-info.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "file-info.h"; sourceTree = ""; }; @@ -1089,8 +1089,8 @@ BEFC1E140C07861A00B0BB3C /* session.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = session.h; sourceTree = ""; }; BEFC1E150C07861A00B0BB3C /* inout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = inout.h; sourceTree = ""; }; BEFC1E160C07861A00B0BB3C /* inout.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = inout.cc; sourceTree = ""; }; - BEFC1E190C07861A00B0BB3C /* open-files.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = open-files.h; sourceTree = ""; }; - BEFC1E1A0C07861A00B0BB3C /* open-files.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = open-files.cc; sourceTree = ""; }; + BEFC1E190C07861A00B0BB3C /* open-files.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "open-files.h"; sourceTree = ""; }; + BEFC1E1A0C07861A00B0BB3C /* open-files.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "open-files.cc"; sourceTree = ""; }; BEFC1E1C0C07861A00B0BB3C /* completion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = completion.h; sourceTree = ""; }; BEFC1E1D0C07861A00B0BB3C /* completion.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = completion.cc; sourceTree = ""; }; BEFC1E1E0C07861A00B0BB3C /* clients.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = clients.h; sourceTree = ""; }; @@ -2931,7 +2931,7 @@ BEFC1E2F0C07861A00B0BB3C /* session.cc in Sources */, BEFC1E320C07861A00B0BB3C /* torrent.cc in Sources */, 2B9BA6C508B488FE586A0AB0 /* torrents.cc in Sources */, - A47A7C87B8B57BE50DF0D410 /* torrent-files.cc */, + A47A7C87B8B57BE50DF0D410 /* torrent-files.cc in Sources */, BEFC1E360C07861A00B0BB3C /* port-forwarding.cc in Sources */, BEFC1E3C0C07861A00B0BB3C /* platform.cc in Sources */, BEFC1E460C07861A00B0BB3C /* net.cc in Sources */, diff --git a/macosx/CocoaCompatibility.h b/macosx/CocoaCompatibility.h index d2a0cdc2f..826e3f677 100644 --- a/macosx/CocoaCompatibility.h +++ b/macosx/CocoaCompatibility.h @@ -9,8 +9,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) -{ +typedef NS_ENUM(NSInteger, NSImageSymbolScale) { NSImageSymbolScaleLarge = 3, } API_AVAILABLE(macos(11.0)); @@ -19,8 +18,7 @@ typedef NS_ENUM(NSInteger, NSImageSymbolScale) accessibilityDescription:(nullable NSString*)description API_AVAILABLE(macos(11.0)); @end -typedef NS_ENUM(NSInteger, NSWindowToolbarStyle) -{ +typedef NS_ENUM(NSInteger, NSWindowToolbarStyle) { NSWindowToolbarStylePreference = 2, } API_AVAILABLE(macos(11.0)); @@ -28,8 +26,7 @@ typedef NS_ENUM(NSInteger, NSWindowToolbarStyle) @property NSWindowToolbarStyle toolbarStyle API_AVAILABLE(macos(11.0)); @end -typedef NS_ENUM(NSInteger, NSTableViewStyle) -{ +typedef NS_ENUM(NSInteger, NSTableViewStyle) { NSTableViewStyleFullWidth = 1, } API_AVAILABLE(macos(11.0)); diff --git a/macosx/Info.plist b/macosx/Info.plist index ec9a677cc..014360729 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist @@ -62,13 +62,13 @@ public.app-category.utilities LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) - NSAppleScriptEnabled - YES NSAppTransportSecurity NSAllowsArbitraryLoads + NSAppleScriptEnabled + YES NSHumanReadableCopyright Copyright © 2005-2020 The Transmission Project NSMainNibFile diff --git a/macosx/Torrent.mm b/macosx/Torrent.mm index ed922c15f..fb2f5328c 100644 --- a/macosx/Torrent.mm +++ b/macosx/Torrent.mm @@ -1875,7 +1875,7 @@ bool trashDataFile(char const* filename, tr_error** error) tempNode = [[FileListNode alloc] initWithFolderName:pathComponents[0] path:@"" torrent:self]; } - [self insertPathForComponents:pathComponents + [self insertPathForComponents:pathComponents // withComponentIndex:1 forParent:tempNode fileSize:file.length @@ -1945,7 +1945,10 @@ bool trashDataFile(char const* filename, tr_error** error) { [node insertIndex:index withSize:size]; - [self insertPathForComponents:components withComponentIndex:(componentIndex + 1) forParent:node fileSize:size + [self insertPathForComponents:components // + withComponentIndex:componentIndex + 1 + forParent:node + fileSize:size index:index flatList:flatFileList]; }