mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Modern Objective-C syntax (#509) 

* Update enabled complier warnings

* Convert to Modern Objective-C syntax using Xcode's tool

* Convert to modern objc syntax manually, fix some PR issues

* Remove unnecessary parentheses

* Use property syntax for all custom properties

* Use property syntax for all system properties

* Fix erroneously autoreleased values

* Revert VDKQueue to old objc syntax

Co-authored-by: Mike Gelfand <mikedld@users.noreply.github.com>
Co-authored-by: Mitch Livingston <livings124@mac.com>
This commit is contained in:
Dmitry Serov 2021-08-07 14:27:56 +07:00 committed by GitHub
parent 53d49f3a81
commit af3a4d4557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
101 changed files with 3504 additions and 3481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Transmission.xcodeproj/project.pbxproj
View File

@ -2180,7 +2180,8 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0420;
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 0920;
ORGANIZATIONNAME = "The Transmission Project";
TargetAttributes = {
8D1107260486CEB800E47090 = {
@ -3054,11 +3055,19 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
@ -3080,6 +3089,7 @@
);
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
@ -3203,11 +3213,19 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
@ -3228,6 +3246,7 @@
);
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
@ -3285,11 +3304,19 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COMBINE_HIDPI_IMAGES = YES;
@ -3311,6 +3338,7 @@
);
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;

2
macosx/AboutWindowController.h
View File

@ -30,7 +30,7 @@
IBOutlet NSPanel * fLicenseSheet;
}
+ (AboutWindowController *) aboutController;
@property (nonatomic, class, readonly) AboutWindowController * aboutController;
- (IBAction) showLicense: (id) sender;
- (IBAction) hideLicense: (id) sender;

26
macosx/AboutWindowController.m
View File

@ -36,29 +36,29 @@ AboutWindowController * fAboutBoxInstance = nil;
- (void) awakeFromNib
{
[fVersionField setStringValue: @(LONG_VERSION_STRING)];
fVersionField.stringValue = @(LONG_VERSION_STRING);
[fCopyrightField setStringValue: [[NSBundle mainBundle] localizedStringForKey: @"NSHumanReadableCopyright"
value: nil table: @"InfoPlist"]];
fCopyrightField.stringValue = [NSBundle.mainBundle localizedStringForKey: @"NSHumanReadableCopyright"
value: nil table: @"InfoPlist"];
[[fTextView textStorage] setAttributedString: [[NSAttributedString alloc] initWithPath:
[[NSBundle mainBundle] pathForResource: @"Credits" ofType: @"rtf"] documentAttributes: nil]];
[fTextView.textStorage setAttributedString: [[NSAttributedString alloc] initWithPath:
[NSBundle.mainBundle pathForResource: @"Credits" ofType: @"rtf"] documentAttributes: nil]];
//size license button
const CGFloat oldButtonWidth = NSWidth([fLicenseButton frame]);
const CGFloat oldButtonWidth = NSWidth(fLicenseButton.frame);
[fLicenseButton setTitle: NSLocalizedString(@"License", "About window -> license button")];
fLicenseButton.title = NSLocalizedString(@"License", "About window -> license button");
[fLicenseButton sizeToFit];
NSRect buttonFrame = [fLicenseButton frame];
NSRect buttonFrame = fLicenseButton.frame;
buttonFrame.size.width += 10.0;
buttonFrame.origin.x -= NSWidth(buttonFrame) - oldButtonWidth;
[fLicenseButton setFrame: buttonFrame];
fLicenseButton.frame = buttonFrame;
}
- (void) windowDidLoad
{
[[self window] center];
[self.window center];
}
- (void) windowWillClose: (id) sender
@ -68,10 +68,10 @@ AboutWindowController * fAboutBoxInstance = nil;
- (IBAction) showLicense: (id) sender
{
NSString * licenseText = [NSString stringWithContentsOfFile: [[NSBundle mainBundle] pathForResource: @"COPYING" ofType: nil]
NSString * licenseText = [NSString stringWithContentsOfFile: [NSBundle.mainBundle pathForResource: @"COPYING" ofType: nil]
usedEncoding: nil error: NULL];
[fLicenseView setString: licenseText];
[fLicenseCloseButton setTitle: NSLocalizedString(@"OK", "About window -> license close button")];
fLicenseView.string = licenseText;
fLicenseCloseButton.title = NSLocalizedString(@"OK", "About window -> license close button");
[self.window beginSheet: fLicenseSheet completionHandler:nil];
}

4
macosx/AddMagnetWindowController.h
View File

@ -50,9 +50,9 @@
TorrentDeterminationType fGroupDeterminationType;
}
- (id) initWithTorrent: (Torrent *) torrent destination: (NSString *) path controller: (Controller *) controller;
- (instancetype) initWithTorrent: (Torrent *) torrent destination: (NSString *) path controller: (Controller *) controller;
- (Torrent *) torrent;
@property (nonatomic, readonly) Torrent *torrent;
- (void) setDestination: (id) sender;

140
macosx/AddMagnetWindowController.m
View File

@ -44,16 +44,16 @@
@implementation AddMagnetWindowController
- (id) initWithTorrent: (Torrent *) torrent destination: (NSString *) path controller: (Controller *) controller
- (instancetype) initWithTorrent: (Torrent *) torrent destination: (NSString *) path controller: (Controller *) controller
{
if ((self = [super initWithWindowNibName: @"AddMagnetWindow"]))
{
fTorrent = torrent;
fDestination = [path stringByExpandingTildeInPath];
fDestination = path.stringByExpandingTildeInPath;
fController = controller;
fGroupValue = [torrent groupValue];
fGroupValue = torrent.groupValue;
fGroupDeterminationType = TorrentDeterminationAutomatic;
}
return self;
@ -61,63 +61,63 @@
- (void) awakeFromNib
{
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateGroupMenu:)
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(updateGroupMenu:)
name: @"UpdateGroups" object: nil];
NSString * name = [fTorrent name];
[[self window] setTitle: name];
[fNameField setStringValue: name];
[fNameField setToolTip: name];
NSString * name = fTorrent.name;
self.window.title = name;
fNameField.stringValue = name;
fNameField.toolTip = name;
[self setGroupsMenu];
[fGroupPopUp selectItemWithTag: fGroupValue];
NSInteger priorityIndex;
switch ([fTorrent priority])
switch (fTorrent.priority)
{
case TR_PRI_HIGH: priorityIndex = POPUP_PRIORITY_HIGH; break;
case TR_PRI_NORMAL: priorityIndex = POPUP_PRIORITY_NORMAL; break;
case TR_PRI_LOW: priorityIndex = POPUP_PRIORITY_LOW; break;
default:
NSAssert1(NO, @"Unknown priority for adding torrent: %d", [fTorrent priority]);
NSAssert1(NO, @"Unknown priority for adding torrent: %d", fTorrent.priority);
priorityIndex = POPUP_PRIORITY_NORMAL;
}
[fPriorityPopUp selectItemAtIndex: priorityIndex];
[fStartCheck setState: [[NSUserDefaults standardUserDefaults] boolForKey: @"AutoStartDownload"] ? NSOnState : NSOffState];
fStartCheck.state = [NSUserDefaults.standardUserDefaults boolForKey: @"AutoStartDownload"] ? NSOnState : NSOffState;
if (fDestination)
[self setDestinationPath: fDestination determinationType: TorrentDeterminationAutomatic];
else
{
[fLocationField setStringValue: @""];
[fLocationImageView setImage: nil];
fLocationField.stringValue = @"";
fLocationImageView.image = nil;
}
#warning when 10.7-only, switch to auto layout
[fMagnetLinkLabel sizeToFit];
const CGFloat downloadToLabelOldWidth = [fDownloadToLabel frame].size.width;
const CGFloat downloadToLabelOldWidth = fDownloadToLabel.frame.size.width;
[fDownloadToLabel sizeToFit];
const CGFloat changeDestOldWidth = [fChangeDestinationButton frame].size.width;
const CGFloat changeDestOldWidth = fChangeDestinationButton.frame.size.width;
[fChangeDestinationButton sizeToFit];
NSRect changeDestFrame = [fChangeDestinationButton frame];
NSRect changeDestFrame = fChangeDestinationButton.frame;
changeDestFrame.origin.x -= changeDestFrame.size.width - changeDestOldWidth;
[fChangeDestinationButton setFrame: changeDestFrame];
fChangeDestinationButton.frame = changeDestFrame;
NSRect downloadToBoxFrame = [fDownloadToBox frame];
const CGFloat downloadToBoxSizeDiff = ([fDownloadToLabel frame].size.width - downloadToLabelOldWidth) + (changeDestFrame.size.width - changeDestOldWidth);
NSRect downloadToBoxFrame = fDownloadToBox.frame;
const CGFloat downloadToBoxSizeDiff = (fDownloadToLabel.frame.size.width - downloadToLabelOldWidth) + (changeDestFrame.size.width - changeDestOldWidth);
downloadToBoxFrame.size.width -= downloadToBoxSizeDiff;
downloadToBoxFrame.origin.x -= downloadToLabelOldWidth - [fDownloadToLabel frame].size.width;
[fDownloadToBox setFrame: downloadToBoxFrame];
downloadToBoxFrame.origin.x -= downloadToLabelOldWidth - fDownloadToLabel.frame.size.width;
fDownloadToBox.frame = downloadToBoxFrame;
NSRect groupPopUpFrame = [fGroupPopUp frame];
NSRect priorityPopUpFrame = [fPriorityPopUp frame];
const CGFloat popUpOffset = groupPopUpFrame.origin.x - NSMaxX([fGroupLabel frame]);
NSRect groupPopUpFrame = fGroupPopUp.frame;
NSRect priorityPopUpFrame = fPriorityPopUp.frame;
const CGFloat popUpOffset = groupPopUpFrame.origin.x - NSMaxX(fGroupLabel.frame);
[fGroupLabel sizeToFit];
[fPriorityLabel sizeToFit];
NSRect groupLabelFrame = [fGroupLabel frame];
NSRect priorityLabelFrame = [fPriorityLabel frame];
NSRect groupLabelFrame = fGroupLabel.frame;
NSRect priorityLabelFrame = fPriorityLabel.frame;
//first bring them both to the left edge
groupLabelFrame.origin.x = MIN(groupLabelFrame.origin.x, priorityLabelFrame.origin.x);
priorityLabelFrame.origin.x = MIN(groupLabelFrame.origin.x, priorityLabelFrame.origin.x);
@ -127,18 +127,18 @@
priorityLabelFrame.origin.x += labelWidth - priorityLabelFrame.size.width;
groupPopUpFrame.origin.x = NSMaxX(groupLabelFrame) + popUpOffset;
priorityPopUpFrame.origin.x = NSMaxX(priorityLabelFrame) + popUpOffset;
[fGroupLabel setFrame: groupLabelFrame];
[fGroupPopUp setFrame: groupPopUpFrame];
[fPriorityLabel setFrame: priorityLabelFrame];
[fPriorityPopUp setFrame: priorityPopUpFrame];
fGroupLabel.frame = groupLabelFrame;
fGroupPopUp.frame = groupPopUpFrame;
fPriorityLabel.frame = priorityLabelFrame;
fPriorityPopUp.frame = priorityPopUpFrame;
const CGFloat minButtonWidth = 82.0;
const CGFloat oldAddButtonWidth = [fAddButton bounds].size.width;
const CGFloat oldCancelButtonWidth = [fCancelButton bounds].size.width;
const CGFloat oldAddButtonWidth = fAddButton.bounds.size.width;
const CGFloat oldCancelButtonWidth = fCancelButton.bounds.size.width;
[fAddButton sizeToFit];
[fCancelButton sizeToFit];
NSRect addButtonFrame = [fAddButton frame];
NSRect cancelButtonFrame = [fCancelButton frame];
NSRect addButtonFrame = fAddButton.frame;
NSRect cancelButtonFrame = fCancelButton.frame;
CGFloat buttonWidth = MAX(addButtonFrame.size.width, cancelButtonFrame.size.width);
buttonWidth = MAX(buttonWidth, minButtonWidth);
addButtonFrame.size.width = buttonWidth;
@ -146,8 +146,8 @@
const CGFloat addButtonWidthIncrease = buttonWidth - oldAddButtonWidth;
addButtonFrame.origin.x -= addButtonWidthIncrease;
cancelButtonFrame.origin.x -= addButtonWidthIncrease + (buttonWidth - oldCancelButtonWidth);
[fAddButton setFrame: addButtonFrame];
[fCancelButton setFrame: cancelButtonFrame];
fAddButton.frame = addButtonFrame;
fCancelButton.frame = cancelButtonFrame;
[fStartCheck sizeToFit];
}
@ -161,7 +161,7 @@
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[NSNotificationCenter.defaultCenter removeObserver: self];
}
- (Torrent *) torrent
@ -173,18 +173,18 @@
{
NSOpenPanel * panel = [NSOpenPanel openPanel];
[panel setPrompt: NSLocalizedString(@"Select", "Open torrent -> prompt")];
[panel setAllowsMultipleSelection: NO];
[panel setCanChooseFiles: NO];
[panel setCanChooseDirectories: YES];
[panel setCanCreateDirectories: YES];
panel.prompt = NSLocalizedString(@"Select", "Open torrent -> prompt");
panel.allowsMultipleSelection = NO;
panel.canChooseFiles = NO;
panel.canChooseDirectories = YES;
panel.canCreateDirectories = YES;
[panel setMessage: [NSString stringWithFormat: NSLocalizedString(@"Select the download folder for \"%@\"",
"Add -> select destination folder"), [fTorrent name]]];
panel.message = [NSString stringWithFormat: NSLocalizedString(@"Select the download folder for \"%@\"",
"Add -> select destination folder"), fTorrent.name];
[panel beginSheetModalForWindow: [self window] completionHandler: ^(NSInteger result) {
[panel beginSheetModalForWindow: self.window completionHandler: ^(NSInteger result) {
if (result == NSFileHandlingPanelOKButton)
[self setDestinationPath: [[panel URLs][0] path] determinationType:TorrentDeterminationUserSpecified];
[self setDestinationPath: panel.URLs[0].path determinationType:TorrentDeterminationUserSpecified];
else
{
if (!fDestination)
@ -195,22 +195,22 @@
- (void) add: (id) sender
{
if ([[fDestination lastPathComponent] isEqualToString: [fTorrent name]]
&& [[NSUserDefaults standardUserDefaults] boolForKey: @"WarningFolderDataSameName"])
if ([fDestination.lastPathComponent isEqualToString: fTorrent.name]
&& [NSUserDefaults.standardUserDefaults boolForKey: @"WarningFolderDataSameName"])
{
NSAlert * alert = [[NSAlert alloc] init];
[alert setMessageText: NSLocalizedString(@"The destination directory and root data directory have the same name.",
"Add torrent -> same name -> title")];
[alert setInformativeText: NSLocalizedString(@"If you are attempting to use already existing data,"
" the root data directory should be inside the destination directory.", "Add torrent -> same name -> message")];
[alert setAlertStyle: NSWarningAlertStyle];
alert.messageText = NSLocalizedString(@"The destination directory and root data directory have the same name.",
"Add torrent -> same name -> title");
alert.informativeText = NSLocalizedString(@"If you are attempting to use already existing data,"
" the root data directory should be inside the destination directory.", "Add torrent -> same name -> message");
alert.alertStyle = NSWarningAlertStyle;
[alert addButtonWithTitle: NSLocalizedString(@"Cancel", "Add torrent -> same name -> button")];
[alert addButtonWithTitle: NSLocalizedString(@"Add", "Add torrent -> same name -> button")];
[alert setShowsSuppressionButton: YES];
alert.showsSuppressionButton = YES;
[alert beginSheetModalForWindow:[self window] completionHandler:^(NSModalResponse returnCode) {
if ([[alert suppressionButton] state] == NSOnState)
[[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningFolderDataSameName"];
[alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
if (alert.suppressionButton.state == NSOnState)
[NSUserDefaults.standardUserDefaults setBool: NO forKey: @"WarningFolderDataSameName"];
if (returnCode == NSAlertSecondButtonReturn)
[self performSelectorOnMainThread: @selector(confirmAdd) withObject: nil waitUntilDone: NO];
@ -222,7 +222,7 @@
- (void) cancelAdd: (id) sender
{
[[self window] performClose: sender];
[self.window performClose: sender];
}
//only called on cancel
@ -244,7 +244,7 @@
NSAssert1(NO, @"Unknown priority tag for adding torrent: %ld", [sender tag]);
priority = TR_PRI_NORMAL;
}
[fTorrent setPriority: priority];
fTorrent.priority = priority;
}
- (void) updateGroupMenu: (NSNotification *) notification
@ -266,7 +266,7 @@
{
[fTorrent setGroupValue: fGroupValue determinationType: fGroupDeterminationType];
if ([fStartCheck state] == NSOnState)
if (fStartCheck.state == NSOnState)
[fTorrent startTransfer];
[self close];
@ -275,7 +275,7 @@
- (void) setDestinationPath: (NSString *) destination determinationType: (TorrentDeterminationType) determinationType
{
destination = [destination stringByExpandingTildeInPath];
destination = destination.stringByExpandingTildeInPath;
if (!fDestination || ![fDestination isEqualToString: destination])
{
fDestination = destination;
@ -283,17 +283,17 @@
[fTorrent changeDownloadFolderBeforeUsing: fDestination determinationType: determinationType];
}
[fLocationField setStringValue: [fDestination stringByAbbreviatingWithTildeInPath]];
[fLocationField setToolTip: fDestination];
fLocationField.stringValue = fDestination.stringByAbbreviatingWithTildeInPath;
fLocationField.toolTip = fDestination;
ExpandedPathToIconTransformer * iconTransformer = [[ExpandedPathToIconTransformer alloc] init];
[fLocationImageView setImage: [iconTransformer transformedValue: fDestination]];
fLocationImageView.image = [iconTransformer transformedValue: fDestination];
}
- (void) setGroupsMenu
{
NSMenu * groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(changeGroupValue:) isSmall: NO];
[fGroupPopUp setMenu: groupMenu];
NSMenu * groupMenu = [GroupsController.groups groupMenuWithTarget: self action: @selector(changeGroupValue:) isSmall: NO];
fGroupPopUp.menu = groupMenu;
}
- (void) changeGroupValue: (id) sender
@ -302,10 +302,10 @@
fGroupValue = [sender tag];
fGroupDeterminationType = TorrentDeterminationUserSpecified;
if ([[GroupsController groups] usesCustomDownloadLocationForIndex: fGroupValue])
[self setDestinationPath: [[GroupsController groups] customDownloadLocationForIndex: fGroupValue] determinationType: TorrentDeterminationAutomatic];
else if ([fDestination isEqualToString: [[GroupsController groups] customDownloadLocationForIndex: previousGroup]])
[self setDestinationPath: [[NSUserDefaults standardUserDefaults] stringForKey: @"DownloadFolder"] determinationType: TorrentDeterminationAutomatic];
if ([GroupsController.groups usesCustomDownloadLocationForIndex: fGroupValue])
[self setDestinationPath: [GroupsController.groups customDownloadLocationForIndex: fGroupValue] determinationType: TorrentDeterminationAutomatic];
else if ([fDestination isEqualToString: [GroupsController.groups customDownloadLocationForIndex: previousGroup]])
[self setDestinationPath: [NSUserDefaults.standardUserDefaults stringForKey: @"DownloadFolder"] determinationType: TorrentDeterminationAutomatic];
else;
}

4
macosx/AddWindowController.h
View File

@ -56,11 +56,11 @@
TorrentDeterminationType fGroupValueDetermination;
}
- (id) initWithTorrent: (Torrent *) torrent destination: (NSString *) path lockDestination: (BOOL) lockDestination
- (instancetype) initWithTorrent: (Torrent *) torrent destination: (NSString *) path lockDestination: (BOOL) lockDestination
controller: (Controller *) controller torrentFile: (NSString *) torrentFile
deleteTorrentCheckEnableInitially: (BOOL) deleteTorrent canToggleDelete: (BOOL) canToggleDelete; //if canToggleDelete is NO, we will also not delete the file regardless of the delete check's state (this is so it can be disabled and checked for a downloaded torrent, where the file's already deleted)
- (Torrent *) torrent;
@property (nonatomic, readonly) Torrent *torrent;
- (void) setDestination: (id) sender;

146
macosx/AddWindowController.m
View File

@ -49,57 +49,57 @@
@implementation AddWindowController
- (id) initWithTorrent: (Torrent *) torrent destination: (NSString *) path lockDestination: (BOOL) lockDestination
- (instancetype) initWithTorrent: (Torrent *) torrent destination: (NSString *) path lockDestination: (BOOL) lockDestination
controller: (Controller *) controller torrentFile: (NSString *) torrentFile
deleteTorrentCheckEnableInitially: (BOOL) deleteTorrent canToggleDelete: (BOOL) canToggleDelete
{
if ((self = [super initWithWindowNibName: @"AddWindow"]))
{
fTorrent = torrent;
fDestination = [path stringByExpandingTildeInPath];
fDestination = path.stringByExpandingTildeInPath;
fLockDestination = lockDestination;
fController = controller;
fTorrentFile = [torrentFile stringByExpandingTildeInPath];
fTorrentFile = torrentFile.stringByExpandingTildeInPath;
fDeleteTorrentEnableInitially = deleteTorrent;
fCanToggleDelete = canToggleDelete;
fGroupValue = [torrent groupValue];
fGroupValue = torrent.groupValue;
fGroupValueDetermination = TorrentDeterminationAutomatic;
[fVerifyIndicator setUsesThreadedAnimation: YES];
fVerifyIndicator.usesThreadedAnimation = YES;
}
return self;
}
- (void) awakeFromNib
{
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateCheckButtons:) name: @"TorrentFileCheckChange" object: fTorrent];
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(updateCheckButtons:) name: @"TorrentFileCheckChange" object: fTorrent];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateGroupMenu:) name: @"UpdateGroups" object: nil];
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(updateGroupMenu:) name: @"UpdateGroups" object: nil];
[fFileController setTorrent: fTorrent];
NSString * name = [fTorrent name];
[[self window] setTitle: name];
[fNameField setStringValue: name];
[fNameField setToolTip: name];
NSString * name = fTorrent.name;
self.window.title = name;
fNameField.stringValue = name;
fNameField.toolTip = name;
[fIconView setImage: [fTorrent icon]];
fIconView.image = fTorrent.icon;
if (![fTorrent isFolder])
if (!fTorrent.folder)
{
[fFileFilterField setHidden: YES];
[fCheckAllButton setHidden: YES];
[fUncheckAllButton setHidden: YES];
fFileFilterField.hidden = YES;
fCheckAllButton.hidden = YES;
fUncheckAllButton.hidden = YES;
NSRect scrollFrame = [fFileScrollView frame];
const CGFloat diff = NSMinY([fFileScrollView frame]) - NSMinY([fFileFilterField frame]);
NSRect scrollFrame = fFileScrollView.frame;
const CGFloat diff = NSMinY(fFileScrollView.frame) - NSMinY(fFileFilterField.frame);
scrollFrame.origin.y -= diff;
scrollFrame.size.height += diff;
[fFileScrollView setFrame: scrollFrame];
fFileScrollView.frame = scrollFrame;
}
else
[self updateCheckButtons: nil];
@ -108,28 +108,28 @@
[fGroupPopUp selectItemWithTag: fGroupValue];
NSInteger priorityIndex;
switch ([fTorrent priority])
switch (fTorrent.priority)
{
case TR_PRI_HIGH: priorityIndex = POPUP_PRIORITY_HIGH; break;
case TR_PRI_NORMAL: priorityIndex = POPUP_PRIORITY_NORMAL; break;
case TR_PRI_LOW: priorityIndex = POPUP_PRIORITY_LOW; break;
default:
NSAssert1(NO, @"Unknown priority for adding torrent: %d", [fTorrent priority]);
NSAssert1(NO, @"Unknown priority for adding torrent: %d", fTorrent.priority);
priorityIndex = POPUP_PRIORITY_NORMAL;
}
[fPriorityPopUp selectItemAtIndex: priorityIndex];
[fStartCheck setState: [[NSUserDefaults standardUserDefaults] boolForKey: @"AutoStartDownload"] ? NSOnState : NSOffState];
fStartCheck.state = [NSUserDefaults.standardUserDefaults boolForKey: @"AutoStartDownload"] ? NSOnState : NSOffState;
[fDeleteCheck setState: fDeleteTorrentEnableInitially ? NSOnState : NSOffState];
[fDeleteCheck setEnabled: fCanToggleDelete];
fDeleteCheck.state = fDeleteTorrentEnableInitially ? NSOnState : NSOffState;
fDeleteCheck.enabled = fCanToggleDelete;
if (fDestination)
[self setDestinationPath: fDestination determinationType: (fLockDestination ? TorrentDeterminationUserSpecified : TorrentDeterminationAutomatic)];
else
{
[fLocationField setStringValue: @""];
[fLocationImageView setImage: nil];
fLocationField.stringValue = @"";
fLocationImageView.image = nil;
}
fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self
@ -146,7 +146,7 @@
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[NSNotificationCenter.defaultCenter removeObserver: self];
[fTimer invalidate];
}
@ -160,20 +160,20 @@
{
NSOpenPanel * panel = [NSOpenPanel openPanel];
[panel setPrompt: NSLocalizedString(@"Select", "Open torrent -> prompt")];
[panel setAllowsMultipleSelection: NO];
[panel setCanChooseFiles: NO];
[panel setCanChooseDirectories: YES];
[panel setCanCreateDirectories: YES];
panel.prompt = NSLocalizedString(@"Select", "Open torrent -> prompt");
panel.allowsMultipleSelection = NO;
panel.canChooseFiles = NO;
panel.canChooseDirectories = YES;
panel.canCreateDirectories = YES;
[panel setMessage: [NSString stringWithFormat: NSLocalizedString(@"Select the download folder for \"%@\"",
"Add -> select destination folder"), [fTorrent name]]];
panel.message = [NSString stringWithFormat: NSLocalizedString(@"Select the download folder for \"%@\"",
"Add -> select destination folder"), fTorrent.name];
[panel beginSheetModalForWindow: [self window] completionHandler: ^(NSInteger result) {
[panel beginSheetModalForWindow: self.window completionHandler: ^(NSInteger result) {
if (result == NSFileHandlingPanelOKButton)
{
fLockDestination = YES;
[self setDestinationPath: [[panel URLs][0] path] determinationType: TorrentDeterminationUserSpecified];
[self setDestinationPath: panel.URLs[0].path determinationType: TorrentDeterminationUserSpecified];
}
else
{
@ -185,22 +185,22 @@
- (void) add: (id) sender
{
if ([[fDestination lastPathComponent] isEqualToString: [fTorrent name]]
&& [[NSUserDefaults standardUserDefaults] boolForKey: @"WarningFolderDataSameName"])
if ([fDestination.lastPathComponent isEqualToString: fTorrent.name]
&& [NSUserDefaults.standardUserDefaults boolForKey: @"WarningFolderDataSameName"])
{
NSAlert * alert = [[NSAlert alloc] init];
[alert setMessageText: NSLocalizedString(@"The destination directory and root data directory have the same name.",
"Add torrent -> same name -> title")];
[alert setInformativeText: NSLocalizedString(@"If you are attempting to use already existing data,"
" the root data directory should be inside the destination directory.", "Add torrent -> same name -> message")];
[alert setAlertStyle: NSWarningAlertStyle];
alert.messageText = NSLocalizedString(@"The destination directory and root data directory have the same name.",
"Add torrent -> same name -> title");
alert.informativeText = NSLocalizedString(@"If you are attempting to use already existing data,"
" the root data directory should be inside the destination directory.", "Add torrent -> same name -> message");
alert.alertStyle = NSWarningAlertStyle;
[alert addButtonWithTitle: NSLocalizedString(@"Cancel", "Add torrent -> same name -> button")];
[alert addButtonWithTitle: NSLocalizedString(@"Add", "Add torrent -> same name -> button")];
[alert setShowsSuppressionButton: YES];
alert.showsSuppressionButton = YES;
[alert beginSheetModalForWindow:[self window] completionHandler:^(NSModalResponse returnCode) {
if ([[alert suppressionButton] state] == NSOnState)
[[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningFolderDataSameName"];
if (alert.suppressionButton.state == NSOnState)
[NSUserDefaults.standardUserDefaults setBool: NO forKey: @"WarningFolderDataSameName"];
if (returnCode == NSAlertSecondButtonReturn)
[self performSelectorOnMainThread: @selector(confirmAdd) withObject: nil waitUntilDone: NO];
@ -212,7 +212,7 @@
- (void) cancelAdd: (id) sender
{
[[self window] performClose: sender];
[self.window performClose: sender];
}
//only called on cancel
@ -260,23 +260,23 @@
NSAssert1(NO, @"Unknown priority tag for adding torrent: %ld", [sender tag]);
priority = TR_PRI_NORMAL;
}
[fTorrent setPriority: priority];
fTorrent.priority = priority;
}
- (void) updateCheckButtons: (NSNotification *) notification
{
NSString * statusString = [NSString stringForFileSize: [fTorrent size]];
if ([fTorrent isFolder])
NSString * statusString = [NSString stringForFileSize: fTorrent.size];
if (fTorrent.folder)
{
//check buttons
//keep synced with identical code in InfoFileViewController.m
const NSInteger filesCheckState = [fTorrent checkForFiles: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrent fileCount])]];
[fCheckAllButton setEnabled: filesCheckState != NSOnState]; //if anything is unchecked
[fUncheckAllButton setEnabled: ![fTorrent allDownloaded]]; //if there are any checked files that aren't finished
const NSInteger filesCheckState = [fTorrent checkForFiles: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, fTorrent.fileCount)]];
fCheckAllButton.enabled = filesCheckState != NSOnState; //if anything is unchecked
fUncheckAllButton.enabled = !fTorrent.allDownloaded; //if there are any checked files that aren't finished
//status field
NSString * fileString;
NSInteger count = [fTorrent fileCount];
NSInteger count = fTorrent.fileCount;
if (count != 1)
fileString = [NSString stringWithFormat: NSLocalizedString(@"%@ files", "Add torrent -> info"),
[NSString formattedUInteger: count]];
@ -284,12 +284,12 @@
fileString = NSLocalizedString(@"1 file", "Add torrent -> info");
NSString * selectedString = [NSString stringWithFormat: NSLocalizedString(@"%@ selected", "Add torrent -> info"),
[NSString stringForFileSize: [fTorrent totalSizeSelected]]];
[NSString stringForFileSize: fTorrent.totalSizeSelected]];
statusString = [NSString stringWithFormat: @"%@, %@ (%@)", fileString, statusString, selectedString];
}
[fStatusField setStringValue: statusString];
fStatusField.stringValue = statusString;
}
- (void) updateGroupMenu: (NSNotification *) notification
@ -315,17 +315,17 @@
[self updateCheckButtons: nil]; //call in case button state changed by checking
if ([fTorrent isChecking])
if (fTorrent.checking)
{
const BOOL waiting = [fTorrent isCheckingWaiting];
[fVerifyIndicator setIndeterminate: waiting];
const BOOL waiting = fTorrent.checkingWaiting;
fVerifyIndicator.indeterminate = waiting;
if (waiting)
[fVerifyIndicator startAnimation: self];
else
[fVerifyIndicator setDoubleValue: [fTorrent checkingProgress]];
fVerifyIndicator.doubleValue = fTorrent.checkingProgress;
}
else {
[fVerifyIndicator setIndeterminate: YES]; //we want to hide when stopped, which only applies when indeterminate
fVerifyIndicator.indeterminate = YES; //we want to hide when stopped, which only applies when indeterminate
[fVerifyIndicator stopAnimation: self];
}
}
@ -336,10 +336,10 @@
fTimer = nil;
[fTorrent setGroupValue: fGroupValue determinationType: fGroupValueDetermination];
if (fTorrentFile && fCanToggleDelete && [fDeleteCheck state] == NSOnState)
if (fTorrentFile && fCanToggleDelete && fDeleteCheck.state == NSOnState)
[Torrent trashFile: fTorrentFile error: nil];
if ([fStartCheck state] == NSOnState)
if (fStartCheck.state == NSOnState)
[fTorrent startTransfer];
[fFileController setTorrent: nil]; //avoid a crash when window tries to update
@ -350,7 +350,7 @@
- (void) setDestinationPath: (NSString *) destination determinationType: (TorrentDeterminationType) determinationType
{
destination = [destination stringByExpandingTildeInPath];
destination = destination.stringByExpandingTildeInPath;
if (!fDestination || ![fDestination isEqualToString: destination])
{
fDestination = destination;
@ -358,17 +358,17 @@
[fTorrent changeDownloadFolderBeforeUsing: fDestination determinationType: determinationType];
}
[fLocationField setStringValue: [fDestination stringByAbbreviatingWithTildeInPath]];
[fLocationField setToolTip: fDestination];
fLocationField.stringValue = fDestination.stringByAbbreviatingWithTildeInPath;
fLocationField.toolTip = fDestination;
ExpandedPathToIconTransformer * iconTransformer = [[ExpandedPathToIconTransformer alloc] init];
[fLocationImageView setImage: [iconTransformer transformedValue: fDestination]];
fLocationImageView.image = [iconTransformer transformedValue: fDestination];
}
- (void) setGroupsMenu
{
NSMenu * groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(changeGroupValue:) isSmall: NO];
[fGroupPopUp setMenu: groupMenu];
NSMenu * groupMenu = [GroupsController.groups groupMenuWithTarget: self action: @selector(changeGroupValue:) isSmall: NO];
fGroupPopUp.menu = groupMenu;
}
- (void) changeGroupValue: (id) sender
@ -379,10 +379,10 @@
if (!fLockDestination)
{
if ([[GroupsController groups] usesCustomDownloadLocationForIndex: fGroupValue])
[self setDestinationPath: [[GroupsController groups] customDownloadLocationForIndex: fGroupValue] determinationType: TorrentDeterminationAutomatic];
else if ([fDestination isEqualToString: [[GroupsController groups] customDownloadLocationForIndex: previousGroup]])
[self setDestinationPath: [[NSUserDefaults standardUserDefaults] stringForKey: @"DownloadFolder"] determinationType: TorrentDeterminationAutomatic];
if ([GroupsController.groups usesCustomDownloadLocationForIndex: fGroupValue])
[self setDestinationPath: [GroupsController.groups customDownloadLocationForIndex: fGroupValue] determinationType: TorrentDeterminationAutomatic];
else if ([fDestination isEqualToString: [GroupsController.groups customDownloadLocationForIndex: previousGroup]])
[self setDestinationPath: [NSUserDefaults.standardUserDefaults stringForKey: @"DownloadFolder"] determinationType: TorrentDeterminationAutomatic];
else;
}
}

2
macosx/BadgeView.h
View File

@ -34,7 +34,7 @@
BOOL fQuitting;
}
- (id) initWithLib: (tr_session *) lib;
- (instancetype) initWithLib: (tr_session *) lib;
- (BOOL) setRatesWithDownload: (CGFloat) downloadRate upload: (CGFloat) uploadRate;
- (void) setQuitting;

16
macosx/BadgeView.m
View File

@ -33,7 +33,7 @@
@implementation BadgeView
- (id) initWithLib: (tr_session *) lib
- (instancetype) initWithLib: (tr_session *) lib
{
if ((self = [super init]))
{
@ -65,13 +65,13 @@
- (void) drawRect: (NSRect) rect
{
[[NSApp applicationIconImage] drawInRect: rect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
[NSApp.applicationIconImage drawInRect: rect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
if (fQuitting)
{
NSImage * quitBadge = [NSImage imageNamed: @"QuitBadge"];
[self badge: quitBadge string: NSLocalizedString(@"Quitting", "Dock Badger -> quit")
atHeight: (NSHeight(rect) - [quitBadge size].height) * 0.5 adjustForQuit: YES];
atHeight: (NSHeight(rect) - quitBadge.size.height) * 0.5 adjustForQuit: YES];
return;
}
@ -83,7 +83,7 @@
NSImage * uploadBadge = [NSImage imageNamed: @"UploadBadge"];
[self badge: uploadBadge string: [NSString stringForSpeedAbbrev: fUploadRate] atHeight: bottom adjustForQuit: NO];
if (download)
bottom += [uploadBadge size].height + BETWEEN_PADDING; //download rate above upload rate
bottom += uploadBadge.size.height + BETWEEN_PADDING; //download rate above upload rate
}
if (download)
[self badge: [NSImage imageNamed: @"DownloadBadge"] string: [NSString stringForSpeedAbbrev: fDownloadRate]
@ -99,17 +99,17 @@
if (!fAttributes)
{
NSShadow * stringShadow = [[NSShadow alloc] init];
[stringShadow setShadowOffset: NSMakeSize(2.0, -2.0)];
[stringShadow setShadowBlurRadius: 4.0];
stringShadow.shadowOffset = NSMakeSize(2.0, -2.0);
stringShadow.shadowBlurRadius = 4.0;
fAttributes = [[NSMutableDictionary alloc] initWithCapacity: 3];
fAttributes[NSForegroundColorAttributeName] = [NSColor whiteColor];
fAttributes[NSForegroundColorAttributeName] = NSColor.whiteColor;
fAttributes[NSShadowAttributeName] = stringShadow;
}
NSRect badgeRect;
badgeRect.size = [badge size];
badgeRect.size = badge.size;
badgeRect.origin.x = 0.0;
badgeRect.origin.y = height;

2
macosx/Badger.h
View File

@ -33,7 +33,7 @@
NSMutableSet * fHashes;
}
- (id) initWithLib: (tr_session *) lib;
- (instancetype) initWithLib: (tr_session *) lib;
- (void) updateBadgeWithDownload: (CGFloat) downloadRate upload: (CGFloat) uploadRate;
- (void) addCompletedTorrent: (Torrent *) torrent;

34
macosx/Badger.m
View File

@ -27,14 +27,14 @@
@implementation Badger
- (id) initWithLib: (tr_session *) lib
- (instancetype) initWithLib: (tr_session *) lib
{
if ((self = [super init]))
{
fLib = lib;
BadgeView * view = [[BadgeView alloc] initWithLib: lib];
[[NSApp dockTile] setContentView: view];
NSApp.dockTile.contentView = view;
fHashes = [[NSMutableSet alloc] init];
}
@ -45,50 +45,50 @@
- (void) updateBadgeWithDownload: (CGFloat) downloadRate upload: (CGFloat) uploadRate
{
const CGFloat displayDlRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeDownloadRate"]
const CGFloat displayDlRate = [NSUserDefaults.standardUserDefaults boolForKey: @"BadgeDownloadRate"]
? downloadRate : 0.0;
const CGFloat displayUlRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeUploadRate"]
const CGFloat displayUlRate = [NSUserDefaults.standardUserDefaults boolForKey: @"BadgeUploadRate"]
? uploadRate : 0.0;
//only update if the badged values change
if ([(BadgeView *)[[NSApp dockTile] contentView] setRatesWithDownload: displayDlRate upload: displayUlRate])
[[NSApp dockTile] display];
if ([(BadgeView *)NSApp.dockTile.contentView setRatesWithDownload: displayDlRate upload: displayUlRate])
[NSApp.dockTile display];
}
- (void) addCompletedTorrent: (Torrent *) torrent
{
NSParameterAssert(torrent != nil);
[fHashes addObject: [torrent hashString]];
[[NSApp dockTile] setBadgeLabel: [NSString formattedUInteger: [fHashes count]]];
[fHashes addObject: torrent.hashString];
NSApp.dockTile.badgeLabel = [NSString formattedUInteger: fHashes.count];
}
- (void) removeTorrent: (Torrent *) torrent
{
if ([fHashes member: [torrent hashString]])
if ([fHashes member: torrent.hashString])
{
[fHashes removeObject: [torrent hashString]];
if ([fHashes count] > 0)
[[NSApp dockTile] setBadgeLabel: [NSString formattedUInteger: [fHashes count]]];
[fHashes removeObject: torrent.hashString];
if (fHashes.count > 0)
NSApp.dockTile.badgeLabel = [NSString formattedUInteger: fHashes.count];
else
[[NSApp dockTile] setBadgeLabel: @""];
NSApp.dockTile.badgeLabel = @"";
}
}
- (void) clearCompleted
{
if ([fHashes count] > 0)
if (fHashes.count > 0)
{
[fHashes removeAllObjects];
[[NSApp dockTile] setBadgeLabel: @""];
NSApp.dockTile.badgeLabel = @"";
}
}
- (void) setQuitting
{
[self clearCompleted];
[(BadgeView *)[[NSApp dockTile] contentView] setQuitting];
[[NSApp dockTile] display];
[(BadgeView *)NSApp.dockTile.contentView setQuitting];
[NSApp.dockTile display];
}
@end

7
macosx/BlocklistDownloader.h
View File

@ -24,12 +24,11 @@
@class BlocklistDownloaderViewController;
typedef enum
{
typedef NS_ENUM(unsigned int, blocklistDownloadState) {
BLOCKLIST_DL_START,
BLOCKLIST_DL_DOWNLOADING,
BLOCKLIST_DL_PROCESSING
} blocklistDownloadState;
};
@interface BlocklistDownloader : NSObject <NSURLDownloadDelegate>
{
@ -45,7 +44,7 @@ typedef enum
}
+ (BlocklistDownloader *) downloader; //starts download if not already occuring
+ (BOOL) isRunning;
@property (nonatomic, class, readonly) BOOL isRunning;
- (void) setViewController: (BlocklistDownloaderViewController *) viewController;

54
macosx/BlocklistDownloader.m
View File

@ -78,7 +78,7 @@ BlocklistDownloader * fBLDownloader = nil;
[fDownload cancel];
[[BlocklistScheduler scheduler] updateSchedule];
[BlocklistScheduler.scheduler updateSchedule];
fBLDownloader = nil;
}
@ -99,7 +99,7 @@ BlocklistDownloader * fBLDownloader = nil;
fState = BLOCKLIST_DL_DOWNLOADING;
fCurrentSize = 0;
fExpectedSize = [response expectedContentLength];
fExpectedSize = response.expectedContentLength;
[fViewController setStatusProgressForCurrentSize: fCurrentSize expectedSize: fExpectedSize];
}
@ -112,10 +112,10 @@ BlocklistDownloader * fBLDownloader = nil;
- (void) download: (NSURLDownload *) download didFailWithError: (NSError *) error
{
[fViewController setFailed: [error localizedDescription]];
[fViewController setFailed: error.localizedDescription];
[[NSUserDefaults standardUserDefaults] setObject: [NSDate date] forKey: @"BlocklistNewLastUpdate"];
[[BlocklistScheduler scheduler] updateSchedule];
[NSUserDefaults.standardUserDefaults setObject: [NSDate date] forKey: @"BlocklistNewLastUpdate"];
[BlocklistScheduler.scheduler updateSchedule];
fBLDownloader = nil;
}
@ -132,10 +132,10 @@ BlocklistDownloader * fBLDownloader = nil;
[self decompressBlocklist];
dispatch_async(dispatch_get_main_queue(), ^{
const int count = tr_blocklistSetContent([(Controller *)[NSApp delegate] sessionHandle], [fDestination UTF8String]);
const int count = tr_blocklistSetContent(((Controller *)NSApp.delegate).sessionHandle, fDestination.UTF8String);
//delete downloaded file
[[NSFileManager defaultManager] removeItemAtPath: fDestination error: NULL];
[NSFileManager.defaultManager removeItemAtPath: fDestination error: NULL];
if (count > 0)
[fViewController setFinished];
@ -145,11 +145,11 @@ BlocklistDownloader * fBLDownloader = nil;
//update last updated date for schedule
NSDate * date = [NSDate date];
[[NSUserDefaults standardUserDefaults] setObject: date forKey: @"BlocklistNewLastUpdate"];
[[NSUserDefaults standardUserDefaults] setObject: date forKey: @"BlocklistNewLastUpdateSuccess"];
[[BlocklistScheduler scheduler] updateSchedule];
[NSUserDefaults.standardUserDefaults setObject: date forKey: @"BlocklistNewLastUpdate"];
[NSUserDefaults.standardUserDefaults setObject: date forKey: @"BlocklistNewLastUpdateSuccess"];
[BlocklistScheduler.scheduler updateSchedule];
[[NSNotificationCenter defaultCenter] postNotificationName: @"BlocklistUpdated" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"BlocklistUpdated" object: nil];
fBLDownloader = nil;
});
@ -169,9 +169,9 @@ BlocklistDownloader * fBLDownloader = nil;
{
fState = BLOCKLIST_DL_START;
[[BlocklistScheduler scheduler] cancelSchedule];
[BlocklistScheduler.scheduler cancelSchedule];
NSString * urlString = [[NSUserDefaults standardUserDefaults] stringForKey: @"BlocklistURL"];
NSString * urlString = [NSUserDefaults.standardUserDefaults stringForKey: @"BlocklistURL"];
if (!urlString)
urlString = @"";
else if (![urlString isEqualToString: @""] && [urlString rangeOfString: @"://"].location == NSNotFound)
@ -185,28 +185,28 @@ BlocklistDownloader * fBLDownloader = nil;
//.gz, .tar.gz, .tgz, and .bgz will be decompressed by NSURLDownload for us. However, we have to do .zip files manually.
- (void) decompressBlocklist
{
if ([[[fDestination pathExtension] lowercaseString] isEqualToString: @"zip"]) {
if ([fDestination.pathExtension.lowercaseString isEqualToString: @"zip"]) {
BOOL success = NO;
NSString * workingDirectory = [fDestination stringByDeletingLastPathComponent];
NSString * workingDirectory = fDestination.stringByDeletingLastPathComponent;
//First, perform the actual unzipping
NSTask * unzip = [[NSTask alloc] init];
[unzip setLaunchPath: @"/usr/bin/unzip"];
[unzip setCurrentDirectoryPath: workingDirectory];
[unzip setArguments: @[
unzip.launchPath = @"/usr/bin/unzip";
unzip.currentDirectoryPath = workingDirectory;
unzip.arguments = @[
@"-o", /* overwrite */
@"-q", /* quiet! */
fDestination, /* source zip file */
@"-d", workingDirectory /*destination*/
]];
];
@try
{
[unzip launch];
[unzip waitUntilExit];
if ([unzip terminationStatus] == 0)
if (unzip.terminationStatus == 0)
success = YES;
}
@catch(id exc)
@ -219,27 +219,27 @@ BlocklistDownloader * fBLDownloader = nil;
NSTask *zipinfo;
zipinfo = [[NSTask alloc] init];
[zipinfo setLaunchPath: @"/usr/bin/zipinfo"];
[zipinfo setArguments: @[
zipinfo.launchPath = @"/usr/bin/zipinfo";
zipinfo.arguments = @[
@"-1", /* just the filename */
fDestination /* source zip file */
]];
[zipinfo setStandardOutput: [NSPipe pipe]];
];
zipinfo.standardOutput = [NSPipe pipe];
@try
{
NSFileHandle * zipinfoOutput = [[zipinfo standardOutput] fileHandleForReading];
NSFileHandle * zipinfoOutput = [zipinfo.standardOutput fileHandleForReading];
[zipinfo launch];
[zipinfo waitUntilExit];
NSString * actualFilename = [[NSString alloc] initWithData: [zipinfoOutput readDataToEndOfFile]
encoding: NSUTF8StringEncoding];
actualFilename = [actualFilename stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
actualFilename = [actualFilename stringByTrimmingCharactersInSet: NSCharacterSet.whitespaceAndNewlineCharacterSet];
NSString * newBlocklistPath = [workingDirectory stringByAppendingPathComponent: actualFilename];
//Finally, delete the ZIP file; we're done with it, and we'll return the unzipped blocklist
[[NSFileManager defaultManager] removeItemAtPath: fDestination error: NULL];
[NSFileManager.defaultManager removeItemAtPath: fDestination error: NULL];
fDestination = newBlocklistPath;
}

42
macosx/BlocklistDownloaderViewController.m
View File

@ -27,7 +27,7 @@
@interface BlocklistDownloaderViewController (Private)
- (id) initWithPrefsController: (PrefsController *) prefsController;
- (instancetype) initWithPrefsController: (PrefsController *) prefsController;
- (void) startDownload;
@end
@ -46,16 +46,16 @@ BlocklistDownloaderViewController * fBLViewController = nil;
- (void) awakeFromNib
{
[fButton setTitle: NSLocalizedString(@"Cancel", "Blocklist -> cancel button")];
fButton.title = NSLocalizedString(@"Cancel", "Blocklist -> cancel button");
const CGFloat oldWidth = NSWidth([fButton frame]);
const CGFloat oldWidth = NSWidth(fButton.frame);
[fButton sizeToFit];
NSRect buttonFrame = [fButton frame];
NSRect buttonFrame = fButton.frame;
buttonFrame.size.width += 12.0; //sizeToFit sizes a bit too small
buttonFrame.origin.x -= NSWidth(buttonFrame) - oldWidth;
[fButton setFrame: buttonFrame];
fButton.frame = buttonFrame;
[fProgressBar setUsesThreadedAnimation: YES];
fProgressBar.usesThreadedAnimation = YES;
[fProgressBar startAnimation: self];
}
@ -66,8 +66,8 @@ BlocklistDownloaderViewController * fBLViewController = nil;
- (void) setStatusStarting
{
[fTextField setStringValue: [NSLocalizedString(@"Connecting to site", "Blocklist -> message") stringByAppendingEllipsis]];
[fProgressBar setIndeterminate: YES];
fTextField.stringValue = [NSLocalizedString(@"Connecting to site", "Blocklist -> message") stringByAppendingEllipsis];
fProgressBar.indeterminate = YES;
}
- (void) setStatusProgressForCurrentSize: (NSUInteger) currentSize expectedSize: (long long) expectedSize
@ -75,26 +75,26 @@ BlocklistDownloaderViewController * fBLViewController = nil;
NSString * string = NSLocalizedString(@"Downloading blocklist", "Blocklist -> message");
if (expectedSize != NSURLResponseUnknownLength)
{
[fProgressBar setIndeterminate: NO];
fProgressBar.indeterminate = NO;
NSString * substring = [NSString stringForFilePartialSize: currentSize fullSize: expectedSize];
string = [string stringByAppendingFormat: @" (%@)", substring];
[fProgressBar setDoubleValue: (double)currentSize / expectedSize];
fProgressBar.doubleValue = (double)currentSize / expectedSize;
}
else
string = [string stringByAppendingFormat: @" (%@)", [NSString stringForFileSize: currentSize]];
[fTextField setStringValue: string];
fTextField.stringValue = string;
}
- (void) setStatusProcessing
{
//change to indeterminate while processing
[fProgressBar setIndeterminate: YES];
fProgressBar.indeterminate = YES;
[fProgressBar startAnimation: self];
[fTextField setStringValue: [NSLocalizedString(@"Processing blocklist", "Blocklist -> message") stringByAppendingEllipsis]];
[fButton setEnabled: NO];
fTextField.stringValue = [NSLocalizedString(@"Processing blocklist", "Blocklist -> message") stringByAppendingEllipsis];
fButton.enabled = NO;
}
- (void) setFinished
@ -112,13 +112,13 @@ BlocklistDownloaderViewController * fBLViewController = nil;
NSAlert * alert = [[NSAlert alloc] init];
[alert addButtonWithTitle: NSLocalizedString(@"OK", "Blocklist -> button")];
[alert setMessageText: NSLocalizedString(@"Download of the blocklist failed.", "Blocklist -> message")];
[alert setAlertStyle: NSWarningAlertStyle];
alert.messageText = NSLocalizedString(@"Download of the blocklist failed.", "Blocklist -> message");
alert.alertStyle = NSWarningAlertStyle;
[alert setInformativeText: error];
alert.informativeText = error;
[alert beginSheetModalForWindow:[fPrefsController window] completionHandler:^(NSModalResponse returnCode) {
[[alert window] orderOut: self];
[alert beginSheetModalForWindow:fPrefsController.window completionHandler:^(NSModalResponse returnCode) {
[alert.window orderOut: self];
fBLViewController = nil;
}];
@ -128,7 +128,7 @@ BlocklistDownloaderViewController * fBLViewController = nil;
@implementation BlocklistDownloaderViewController (Private)
- (id) initWithPrefsController: (PrefsController *) prefsController
- (instancetype) initWithPrefsController: (PrefsController *) prefsController
{
if ((self = [super init]))
{
@ -141,7 +141,7 @@ BlocklistDownloaderViewController * fBLViewController = nil;
- (void) startDownload
{
//load window and show as sheet
[[NSBundle mainBundle] loadNibNamed: @"BlocklistStatusWindow" owner: self topLevelObjects: NULL];
[NSBundle.mainBundle loadNibNamed: @"BlocklistStatusWindow" owner: self topLevelObjects: NULL];
BlocklistDownloader * downloader = [BlocklistDownloader downloader];
[downloader setViewController: self]; //do before showing the sheet to ensure it doesn't slide out with placeholder text

2
macosx/BlocklistScheduler.h
View File

@ -27,7 +27,7 @@
NSTimer * fTimer;
}
+ (BlocklistScheduler *) scheduler;
@property (nonatomic, class, readonly) BlocklistScheduler * scheduler;
- (void) updateSchedule;
- (void) cancelSchedule;

12
macosx/BlocklistScheduler.m
View File

@ -48,19 +48,19 @@ BlocklistScheduler * fScheduler = nil;
- (void) updateSchedule
{
if ([BlocklistDownloader isRunning])
if (BlocklistDownloader.isRunning)
return;
[self cancelSchedule];
NSString * blocklistURL;
if (![[NSUserDefaults standardUserDefaults] boolForKey: @"BlocklistNew"]
|| !((blocklistURL = [[NSUserDefaults standardUserDefaults] stringForKey: @"BlocklistURL"]) &&
if (![NSUserDefaults.standardUserDefaults boolForKey: @"BlocklistNew"]
|| !((blocklistURL = [NSUserDefaults.standardUserDefaults stringForKey: @"BlocklistURL"]) &&
![blocklistURL isEqualToString: @""])
|| ![[NSUserDefaults standardUserDefaults] boolForKey: @"BlocklistAutoUpdate"])
|| ![NSUserDefaults.standardUserDefaults boolForKey: @"BlocklistAutoUpdate"])
return;
NSDate * lastUpdateDate = [[NSUserDefaults standardUserDefaults] objectForKey: @"BlocklistNewLastUpdate"];
NSDate * lastUpdateDate = [NSUserDefaults.standardUserDefaults objectForKey: @"BlocklistNewLastUpdate"];
if (lastUpdateDate)
lastUpdateDate = [lastUpdateDate dateByAddingTimeInterval: FULL_WAIT];
NSDate * closeDate = [NSDate dateWithTimeIntervalSinceNow: SMALL_DELAY];
@ -70,7 +70,7 @@ BlocklistScheduler * fScheduler = nil;
fTimer = [[NSTimer alloc] initWithFireDate: useDate interval: 0 target: self selector: @selector(runUpdater) userInfo: nil repeats: NO];
//current run loop usually means a second update won't work
NSRunLoop * loop = [NSRunLoop mainRunLoop];
NSRunLoop * loop = NSRunLoop.mainRunLoop;
[loop addTimer: fTimer forMode: NSDefaultRunLoopMode];
[loop addTimer: fTimer forMode: NSModalPanelRunLoopMode];
[loop addTimer: fTimer forMode: NSEventTrackingRunLoopMode];

4
macosx/BonjourController.h
View File

@ -27,8 +27,8 @@
NSNetService * fService;
}
+ (BonjourController *) defaultController;
+ (BOOL) defaultControllerExists;
@property (nonatomic, class, readonly) BonjourController * defaultController;
@property (nonatomic, class, readonly) BOOL defaultControllerExists;
- (void) startWithPort: (int) port;
- (void) stop;

12
macosx/BonjourController.m
View File

@ -47,12 +47,12 @@ BonjourController * fDefaultController = nil;
{
[self stop];
NSMutableString * serviceName = [NSMutableString stringWithFormat: @"Transmission (%@ - %@)", NSUserName(), [[NSHost currentHost] localizedName]];
if ([serviceName length] > BONJOUR_SERVICE_NAME_MAX_LENGTH)
[serviceName deleteCharactersInRange: NSMakeRange(BONJOUR_SERVICE_NAME_MAX_LENGTH, [serviceName length] - BONJOUR_SERVICE_NAME_MAX_LENGTH)];
NSMutableString * serviceName = [NSMutableString stringWithFormat: @"Transmission (%@ - %@)", NSUserName(), [NSHost currentHost].localizedName];
if (serviceName.length > BONJOUR_SERVICE_NAME_MAX_LENGTH)
[serviceName deleteCharactersInRange: NSMakeRange(BONJOUR_SERVICE_NAME_MAX_LENGTH, serviceName.length - BONJOUR_SERVICE_NAME_MAX_LENGTH)];
fService = [[NSNetService alloc] initWithDomain: @"" type: @"_http._tcp." name: serviceName port: port];
[fService setDelegate: self];
fService.delegate = self;
[fService publish];
}
@ -65,12 +65,12 @@ BonjourController * fDefaultController = nil;
- (void) netService: (NSNetService *) sender didNotPublish: (NSDictionary *) errorDict
{
NSLog(@"Failed to publish the web interface service on port %ld, with error: %@", [sender port], errorDict);
NSLog(@"Failed to publish the web interface service on port %ld, with error: %@", sender.port, errorDict);
}
- (void) netService: (NSNetService *) sender didNotResolve: (NSDictionary *) errorDict
{
NSLog(@"Failed to resolve the web interface service on port %ld, with error: %@", [sender port], errorDict);
NSLog(@"Failed to resolve the web interface service on port %ld, with error: %@", sender.port, errorDict);
}
@end

8
macosx/ButtonToolbarItem.m
View File

@ -26,14 +26,14 @@
- (void) validate
{
[self setEnabled: [[self target] validateToolbarItem: self]];
self.enabled = [self.target validateToolbarItem: self];
}
- (NSMenuItem *) menuFormRepresentation
{
NSMenuItem * menuItem = [[NSMenuItem alloc] initWithTitle: [self label] action: [self action] keyEquivalent: @""];
[menuItem setTarget: [self target]];
[menuItem setEnabled: [[self target] validateToolbarItem: self]];
NSMenuItem * menuItem = [[NSMenuItem alloc] initWithTitle: self.label action: self.action keyEquivalent: @""];
menuItem.target = self.target;
menuItem.enabled = [self.target validateToolbarItem: self];
return menuItem;
}

8
macosx/ColorTextField.m
View File

@ -26,15 +26,15 @@
- (void) awakeFromNib
{
[self setEnabled: [self isEnabled]];
self.enabled = self.enabled;
}
- (void) setEnabled: (BOOL) flag
{
[super setEnabled: flag];
super.enabled = flag;
NSColor * color = flag ? [NSColor controlTextColor] : [NSColor disabledControlTextColor];
[self setTextColor: color];
NSColor * color = flag ? NSColor.controlTextColor : NSColor.disabledControlTextColor;
self.textColor = color;
}
@end

15
macosx/Controller.h
View File

@ -40,16 +40,15 @@
@class TorrentTableView;
@class URLSheetWindowController;
typedef enum
{
typedef NS_ENUM(unsigned int, addType) {
ADD_MANUAL,
ADD_AUTO,
ADD_SHOW_OPTIONS,
ADD_URL,
ADD_CREATED
} addType;
};
@interface Controller : NSObject <NSURLDownloadDelegate, NSUserNotificationCenterDelegate, NSPopoverDelegate, NSSharingServiceDelegate, NSSharingServicePickerDelegate, NSSoundDelegate, NSToolbarDelegate, NSWindowDelegate, QLPreviewPanelDataSource, QLPreviewPanelDelegate, VDKQueueDelegate>
@interface Controller : NSObject <NSApplicationDelegate, NSURLDownloadDelegate, NSUserNotificationCenterDelegate, NSPopoverDelegate, NSSharingServiceDelegate, NSSharingServicePickerDelegate, NSSoundDelegate, NSToolbarDelegate, NSWindowDelegate, QLPreviewPanelDataSource, QLPreviewPanelDelegate, VDKQueueDelegate>
{
IBOutlet NSWindow * fWindow;
IBOutlet TorrentTableView * fTableView;
@ -87,7 +86,7 @@ typedef enum
- (void) openURL: (NSString *) urlString;
- (void) openURLShowSheet: (id) sender;
- (tr_session *) sessionHandle;
@property (nonatomic, readonly) tr_session *sessionHandle;
- (void) createFile: (id) sender;
@ -127,7 +126,7 @@ typedef enum
- (void) verifySelectedTorrents: (id) sender;
- (void) verifyTorrents: (NSArray *) torrents;
- (NSArray *)selectedTorrents;
@property (nonatomic, readonly) NSArray *selectedTorrents;
@property (nonatomic, readonly) PrefsController * prefsController;
- (void) showPreferenceWindow: (id) sender;
@ -199,10 +198,10 @@ typedef enum
- (void) selectedToolbarClicked: (id) sender;
- (void) setWindowSizeToFit;
- (NSRect) sizedWindowFrame;
@property (nonatomic, readonly) NSRect sizedWindowFrame;
- (void) updateForAutoSize;
- (void) setWindowMinMaxToCurrent;
- (CGFloat) minWindowContentSizeAllowed;
@property (nonatomic, readonly) CGFloat minWindowContentSizeAllowed;
- (void) updateForExpandCollape;

1503
macosx/Controller.m
View File

File diff suppressed because it is too large Load Diff

2
macosx/CreatorWindowController.h
View File

@ -50,7 +50,7 @@
+ (CreatorWindowController *) createTorrentFile: (tr_session *) handle;
+ (CreatorWindowController *) createTorrentFile: (tr_session *) handle forFile: (NSURL *) file;
- (id) initWithHandle: (tr_session *) handle path: (NSURL *) path;
- (instancetype) initWithHandle: (tr_session *) handle path: (NSURL *) path;
- (IBAction) setLocation: (id) sender;
- (IBAction) create: (id) sender;

279
macosx/CreatorWindowController.m
View File

@ -63,7 +63,7 @@ NSMutableSet *creatorWindowControllerSet = nil;
return creator;
}
- (id) initWithHandle: (tr_session *) handle path: (NSURL *) path
- (instancetype) initWithHandle: (tr_session *) handle path: (NSURL *) path
{
if ((self = [super initWithWindowNibName: @"Creator"]))
{
@ -74,17 +74,17 @@ NSMutableSet *creatorWindowControllerSet = nil;
fStarted = NO;
fPath = path;
fInfo = tr_metaInfoBuilderCreate([[fPath path] UTF8String]);
fInfo = tr_metaInfoBuilderCreate(fPath.path.UTF8String);
if (fInfo->fileCount == 0)
{
NSAlert * alert = [[NSAlert alloc] init];
[alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> no files -> button")];
[alert setMessageText: NSLocalizedString(@"This folder contains no files.",
"Create torrent -> no files -> title")];
[alert setInformativeText: NSLocalizedString(@"There must be at least one file in a folder to create a torrent file.",
"Create torrent -> no files -> warning")];
[alert setAlertStyle: NSWarningAlertStyle];
alert.messageText = NSLocalizedString(@"This folder contains no files.",
"Create torrent -> no files -> title");
alert.informativeText = NSLocalizedString(@"There must be at least one file in a folder to create a torrent file.",
"Create torrent -> no files -> warning");
alert.alertStyle = NSWarningAlertStyle;
[alert runModal];
@ -94,18 +94,18 @@ NSMutableSet *creatorWindowControllerSet = nil;
{
NSAlert * alert = [[NSAlert alloc] init];
[alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> zero size -> button")];
[alert setMessageText: NSLocalizedString(@"The total file size is zero bytes.",
"Create torrent -> zero size -> title")];
[alert setInformativeText: NSLocalizedString(@"A torrent file cannot be created for files with no size.",
"Create torrent -> zero size -> warning")];
[alert setAlertStyle: NSWarningAlertStyle];
alert.messageText = NSLocalizedString(@"The total file size is zero bytes.",
"Create torrent -> zero size -> title");
alert.informativeText = NSLocalizedString(@"A torrent file cannot be created for files with no size.",
"Create torrent -> zero size -> warning");
alert.alertStyle = NSWarningAlertStyle;
[alert runModal];
return nil;
}
fDefaults = [NSUserDefaults standardUserDefaults];
fDefaults = NSUserDefaults.standardUserDefaults;
//get list of trackers
if (!(fTrackers = [[fDefaults arrayForKey: @"CreatorTrackers"] mutableCopy]))
@ -126,7 +126,7 @@ NSMutableSet *creatorWindowControllerSet = nil;
}
//remove potentially invalid addresses
for (NSInteger i = [fTrackers count]-1; i >= 0; i--)
for (NSInteger i = fTrackers.count-1; i >= 0; i--)
{
if (!tr_urlIsValidTracker([fTrackers[i] UTF8String]))
[fTrackers removeObjectAtIndex: i];
@ -139,21 +139,21 @@ NSMutableSet *creatorWindowControllerSet = nil;
- (void) awakeFromNib
{
[[self window] setRestorationClass: [self class]];
self.window.restorationClass = [self class];
NSString * name = [fPath lastPathComponent];
NSString * name = fPath.lastPathComponent;
[[self window] setTitle: name];
self.window.title = name;
[fNameField setStringValue: name];
[fNameField setToolTip: [fPath path]];
fNameField.stringValue = name;
fNameField.toolTip = fPath.path;
const BOOL multifile = fInfo->isFolder;
NSImage * icon = [[NSWorkspace sharedWorkspace] iconForFileType: multifile
? NSFileTypeForHFSTypeCode(kGenericFolderIcon) : [fPath pathExtension]];
[icon setSize: [fIconView frame].size];
[fIconView setImage: icon];
NSImage * icon = [NSWorkspace.sharedWorkspace iconForFileType: multifile
? NSFileTypeForHFSTypeCode(kGenericFolderIcon) : fPath.pathExtension];
icon.size = fIconView.frame.size;
fIconView.image = icon;
NSString * statusString = [NSString stringForFileSize: fInfo->totalSize];
if (multifile)
@ -167,14 +167,14 @@ NSMutableSet *creatorWindowControllerSet = nil;
fileString = NSLocalizedString(@"1 file", "Create torrent -> info");
statusString = [NSString stringWithFormat: @"%@, %@", fileString, statusString];
}
[fStatusField setStringValue: statusString];
fStatusField.stringValue = statusString;
if (fInfo->pieceCount == 1)
[fPiecesField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"1 piece, %@", "Create torrent -> info"),
[NSString stringForFileSize: fInfo->pieceSize]]];
fPiecesField.stringValue = [NSString stringWithFormat: NSLocalizedString(@"1 piece, %@", "Create torrent -> info"),
[NSString stringForFileSize: fInfo->pieceSize]];
else
[fPiecesField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%d pieces, %@ each", "Create torrent -> info"),
fInfo->pieceCount, [NSString stringForFileSize: fInfo->pieceSize]]];
fPiecesField.stringValue = [NSString stringWithFormat: NSLocalizedString(@"%d pieces, %@ each", "Create torrent -> info"),
fInfo->pieceCount, [NSString stringForFileSize: fInfo->pieceSize]];
fLocation = [[fDefaults URLForKey: @"CreatorLocationURL"] URLByAppendingPathComponent: [name stringByAppendingPathExtension: @"torrent"]];
if (!fLocation)
@ -182,15 +182,15 @@ NSMutableSet *creatorWindowControllerSet = nil;
//for 2.5 and earlier
#warning we still store "CreatorLocation" in Defaults.plist, and not "CreatorLocationURL"
NSString * location = [fDefaults stringForKey: @"CreatorLocation"];
fLocation = [[NSURL alloc] initFileURLWithPath: [[location stringByExpandingTildeInPath] stringByAppendingPathComponent: [name stringByAppendingPathExtension: @"torrent"]]];
fLocation = [[NSURL alloc] initFileURLWithPath: [location.stringByExpandingTildeInPath stringByAppendingPathComponent: [name stringByAppendingPathExtension: @"torrent"]]];
}
[self updateLocationField];
//set previously saved values
if ([fDefaults objectForKey: @"CreatorPrivate"])
[fPrivateCheck setState: [fDefaults boolForKey: @"CreatorPrivate"] ? NSOnState : NSOffState];
fPrivateCheck.state = [fDefaults boolForKey: @"CreatorPrivate"] ? NSOnState : NSOffState;
[fOpenCheck setState: [fDefaults boolForKey: @"CreatorOpen"] ? NSOnState : NSOffState];
fOpenCheck.state = [fDefaults boolForKey: @"CreatorOpen"] ? NSOnState : NSOffState;
}
- (void) dealloc
@ -210,7 +210,7 @@ NSMutableSet *creatorWindowControllerSet = nil;
return;
}
NSWindow * window = [[self createTorrentFile: [(Controller *)[NSApp delegate] sessionHandle] forFile: path] window];
NSWindow * window = [self createTorrentFile: ((Controller *)NSApp.delegate).sessionHandle forFile: path].window;
completionHandler(window, nil);
}
@ -219,9 +219,9 @@ NSMutableSet *creatorWindowControllerSet = nil;
[state encodeObject: fPath forKey: @"TRCreatorPath"];
[state encodeObject: fLocation forKey: @"TRCreatorLocation"];
[state encodeObject: fTrackers forKey: @"TRCreatorTrackers"];
[state encodeInteger: [fOpenCheck state] forKey: @"TRCreatorOpenCheck"];
[state encodeInteger: [fPrivateCheck state] forKey: @"TRCreatorPrivateCheck"];
[state encodeObject: [fCommentView string] forKey: @"TRCreatorPrivateComment"];
[state encodeInteger: fOpenCheck.state forKey: @"TRCreatorOpenCheck"];
[state encodeInteger: fPrivateCheck.state forKey: @"TRCreatorPrivateCheck"];
[state encodeObject: fCommentView.string forKey: @"TRCreatorPrivateComment"];
}
- (void) window: (NSWindow *) window didDecodeRestorableState: (NSCoder *) coder
@ -232,29 +232,29 @@ NSMutableSet *creatorWindowControllerSet = nil;
fTrackers = [coder decodeObjectForKey: @"TRCreatorTrackers"];
[fTrackerTable reloadData];
[fOpenCheck setState: [coder decodeIntegerForKey: @"TRCreatorOpenCheck"]];
[fPrivateCheck setState: [coder decodeIntegerForKey: @"TRCreatorPrivateCheck"]];
[fCommentView setString: [coder decodeObjectForKey: @"TRCreatorPrivateComment"]];
fOpenCheck.state = [coder decodeIntegerForKey: @"TRCreatorOpenCheck"];
fPrivateCheck.state = [coder decodeIntegerForKey: @"TRCreatorPrivateCheck"];
fCommentView.string = [coder decodeObjectForKey: @"TRCreatorPrivateComment"];
}
- (IBAction) setLocation: (id) sender
{
NSSavePanel * panel = [NSSavePanel savePanel];
[panel setPrompt: NSLocalizedString(@"Select", "Create torrent -> location sheet -> button")];
[panel setMessage: NSLocalizedString(@"Select the name and location for the torrent file.",
"Create torrent -> location sheet -> message")];
panel.prompt = NSLocalizedString(@"Select", "Create torrent -> location sheet -> button");
panel.message = NSLocalizedString(@"Select the name and location for the torrent file.",
"Create torrent -> location sheet -> message");
[panel setAllowedFileTypes: @[@"org.bittorrent.torrent", @"torrent"]];
[panel setCanSelectHiddenExtension: YES];
panel.allowedFileTypes = @[@"org.bittorrent.torrent", @"torrent"];
panel.canSelectHiddenExtension = YES;
[panel setDirectoryURL: [fLocation URLByDeletingLastPathComponent]];
[panel setNameFieldStringValue: [fLocation lastPathComponent]];
panel.directoryURL = fLocation.URLByDeletingLastPathComponent;
panel.nameFieldStringValue = fLocation.lastPathComponent;
[panel beginSheetModalForWindow: [self window] completionHandler: ^(NSInteger result) {
[panel beginSheetModalForWindow: self.window completionHandler: ^(NSInteger result) {
if (result == NSFileHandlingPanelOKButton)
{
fLocation = [panel URL];
fLocation = panel.URL;
[self updateLocationField];
}
}];
@ -263,15 +263,15 @@ NSMutableSet *creatorWindowControllerSet = nil;
- (IBAction) create: (id) sender
{
//make sure the trackers are no longer being verified
if ([fTrackerTable editedRow] != -1)
[[self window] endEditingFor: fTrackerTable];
if (fTrackerTable.editedRow != -1)
[self.window endEditingFor: fTrackerTable];
const BOOL isPrivate = [fPrivateCheck state] == NSOnState;
if ([fTrackers count] == 0
const BOOL isPrivate = fPrivateCheck.state == NSOnState;
if (fTrackers.count == 0
&& [fDefaults boolForKey: isPrivate ? @"WarningCreatorPrivateBlankAddress" : @"WarningCreatorBlankAddress"])
{
NSAlert * alert = [[NSAlert alloc] init];
[alert setMessageText: NSLocalizedString(@"There are no tracker addresses.", "Create torrent -> blank address -> title")];
alert.messageText = NSLocalizedString(@"There are no tracker addresses.", "Create torrent -> blank address -> title");
NSString * infoString = isPrivate
? NSLocalizedString(@"A transfer marked as private with no tracker addresses will be unable to connect to peers."
@ -281,17 +281,17 @@ NSMutableSet *creatorWindowControllerSet = nil;
" non-tracker peer discovery methods such as PEX and DHT to download and seed.",
"Create torrent -> blank address -> message");
[alert setInformativeText: infoString];
alert.informativeText = infoString;
[alert addButtonWithTitle: NSLocalizedString(@"Create", "Create torrent -> blank address -> button")];
[alert addButtonWithTitle: NSLocalizedString(@"Cancel", "Create torrent -> blank address -> button")];
[alert setShowsSuppressionButton: YES];
alert.showsSuppressionButton = YES;
[alert beginSheetModalForWindow:[self window] completionHandler:^(NSModalResponse returnCode) {
if ([[alert suppressionButton] state] == NSOnState)
[alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
if (alert.suppressionButton.state == NSOnState)
{
[[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningCreatorBlankAddress"]; //set regardless of private/public
if ([fPrivateCheck state] == NSOnState)
[[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningCreatorPrivateBlankAddress"];
[NSUserDefaults.standardUserDefaults setBool: NO forKey: @"WarningCreatorBlankAddress"]; //set regardless of private/public
if (fPrivateCheck.state == NSOnState)
[NSUserDefaults.standardUserDefaults setBool: NO forKey: @"WarningCreatorPrivateBlankAddress"];
}
if (returnCode == NSAlertFirstButtonReturn)
@ -304,7 +304,7 @@ NSMutableSet *creatorWindowControllerSet = nil;
- (IBAction) cancelCreateWindow: (id) sender
{
[[self window] close];
[self.window close];
}
- (void) windowWillClose: (NSNotification *) notification
@ -320,7 +320,7 @@ NSMutableSet *creatorWindowControllerSet = nil;
- (NSInteger) numberOfRowsInTableView: (NSTableView *) tableView
{
return [fTrackers count];
return fTrackers.count;
}
- (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) tableColumn row: (NSInteger) row
@ -331,12 +331,12 @@ NSMutableSet *creatorWindowControllerSet = nil;
- (IBAction) addRemoveTracker: (id) sender
{
//don't allow add/remove when currently adding - it leads to weird results
if ([fTrackerTable editedRow] != -1)
if (fTrackerTable.editedRow != -1)
return;
if ([[sender cell] tagForSegment: [sender selectedSegment]] == TRACKER_REMOVE_TAG)
{
[fTrackers removeObjectsAtIndexes: [fTrackerTable selectedRowIndexes]];
[fTrackers removeObjectsAtIndexes: fTrackerTable.selectedRowIndexes];
[fTrackerTable deselectAll: self];
[fTrackerTable reloadData];
@ -346,7 +346,7 @@ NSMutableSet *creatorWindowControllerSet = nil;
[fTrackers addObject: @""];
[fTrackerTable reloadData];
const NSInteger row = [fTrackers count] - 1;
const NSInteger row = fTrackers.count - 1;
[fTrackerTable selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection: NO];
[fTrackerTable editColumn: 0 row: row withEvent: nil select: YES];
}
@ -357,12 +357,12 @@ NSMutableSet *creatorWindowControllerSet = nil;
{
NSString * tracker = (NSString *)object;
tracker = [tracker stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
tracker = [tracker stringByTrimmingCharactersInSet: NSCharacterSet.whitespaceAndNewlineCharacterSet];
if ([tracker rangeOfString: @"://"].location == NSNotFound)
tracker = [@"http://" stringByAppendingString: tracker];
if (!tr_urlIsValidTracker([tracker UTF8String]))
if (!tr_urlIsValidTracker(tracker.UTF8String))
{
NSBeep();
[fTrackers removeObjectAtIndex: row];
@ -376,29 +376,29 @@ NSMutableSet *creatorWindowControllerSet = nil;
- (void) tableViewSelectionDidChange: (NSNotification *) notification
{
[fTrackerAddRemoveControl setEnabled: [fTrackerTable numberOfSelectedRows] > 0 forSegment: TRACKER_REMOVE_TAG];
[fTrackerAddRemoveControl setEnabled: fTrackerTable.numberOfSelectedRows > 0 forSegment: TRACKER_REMOVE_TAG];
}
- (void) copy: (id) sender
{
NSArray * addresses = [fTrackers objectsAtIndexes: [fTrackerTable selectedRowIndexes]];
NSArray * addresses = [fTrackers objectsAtIndexes: fTrackerTable.selectedRowIndexes];
NSString * text = [addresses componentsJoinedByString: @"\n"];
NSPasteboard * pb = [NSPasteboard generalPasteboard];
NSPasteboard * pb = NSPasteboard.generalPasteboard;
[pb clearContents];
[pb writeObjects: @[text]];
}
- (BOOL) validateMenuItem: (NSMenuItem *) menuItem
{
const SEL action = [menuItem action];
const SEL action = menuItem.action;
if (action == @selector(copy:))
return [[self window] firstResponder] == fTrackerTable && [fTrackerTable numberOfSelectedRows] > 0;
return self.window.firstResponder == fTrackerTable && fTrackerTable.numberOfSelectedRows > 0;
if (action == @selector(paste:))
return [[self window] firstResponder] == fTrackerTable
&& [[NSPasteboard generalPasteboard] canReadObjectForClasses: @[[NSString class]] options: nil];
return self.window.firstResponder == fTrackerTable
&& [NSPasteboard.generalPasteboard canReadObjectForClasses: @[[NSString class]] options: nil];
return YES;
}
@ -407,7 +407,7 @@ NSMutableSet *creatorWindowControllerSet = nil;
{
NSMutableArray * tempTrackers = [NSMutableArray array];
NSArray * items = [[NSPasteboard generalPasteboard] readObjectsForClasses: @[[NSString class]] options: nil];
NSArray * items = [NSPasteboard.generalPasteboard readObjectsForClasses: @[[NSString class]] options: nil];
NSAssert(items != nil, @"no string items to paste; should not be able to call this method");
for (NSString * pbItem in items)
@ -420,12 +420,12 @@ NSMutableSet *creatorWindowControllerSet = nil;
for (__strong NSString * tracker in tempTrackers)
{
tracker = [tracker stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
tracker = [tracker stringByTrimmingCharactersInSet: NSCharacterSet.whitespaceAndNewlineCharacterSet];
if ([tracker rangeOfString: @"://"].location == NSNotFound)
tracker = [@"http://" stringByAppendingString: tracker];
if (tr_urlIsValidTracker([tracker UTF8String]))
if (tr_urlIsValidTracker(tracker.UTF8String))
{
[fTrackers addObject: tracker];
added = YES;
@ -447,73 +447,73 @@ NSMutableSet *creatorWindowControllerSet = nil;
- (void) updateLocationField
{
NSString * pathString = [fLocation path];
[fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]];
[fLocationField setToolTip: pathString];
NSString * pathString = fLocation.path;
fLocationField.stringValue = pathString.stringByAbbreviatingWithTildeInPath;
fLocationField.toolTip = pathString;
}
+ (NSURL *) chooseFile
{
NSOpenPanel * panel = [NSOpenPanel openPanel];
[panel setTitle: NSLocalizedString(@"Create Torrent File", "Create torrent -> select file")];
[panel setPrompt: NSLocalizedString(@"Select", "Create torrent -> select file")];
[panel setAllowsMultipleSelection: NO];
[panel setCanChooseFiles: YES];
[panel setCanChooseDirectories: YES];
[panel setCanCreateDirectories: NO];
panel.title = NSLocalizedString(@"Create Torrent File", "Create torrent -> select file");
panel.prompt = NSLocalizedString(@"Select", "Create torrent -> select file");
panel.allowsMultipleSelection = NO;
panel.canChooseFiles = YES;
panel.canChooseDirectories = YES;
panel.canCreateDirectories = NO;
[panel setMessage: NSLocalizedString(@"Select a file or folder for the torrent file.", "Create torrent -> select file")];
panel.message = NSLocalizedString(@"Select a file or folder for the torrent file.", "Create torrent -> select file");
BOOL success = [panel runModal] == NSModalResponseOK;
return success ? [panel URLs][0] : nil;
return success ? panel.URLs[0] : nil;
}
- (void) createReal
{
//check if the location currently exists
if (![[fLocation URLByDeletingLastPathComponent] checkResourceIsReachableAndReturnError: NULL])
if (![fLocation.URLByDeletingLastPathComponent checkResourceIsReachableAndReturnError: NULL])
{
NSAlert * alert = [[NSAlert alloc] init];
[alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> directory doesn't exist warning -> button")];
[alert setMessageText: NSLocalizedString(@"The chosen torrent file location does not exist.",
"Create torrent -> directory doesn't exist warning -> title")];
[alert setInformativeText: [NSString stringWithFormat:
alert.messageText = NSLocalizedString(@"The chosen torrent file location does not exist.",
"Create torrent -> directory doesn't exist warning -> title");
alert.informativeText = [NSString stringWithFormat:
NSLocalizedString(@"The directory \"%@\" does not currently exist. "
"Create this directory or choose a different one to create the torrent file.",
"Create torrent -> directory doesn't exist warning -> warning"),
[[fLocation URLByDeletingLastPathComponent] path]]];
[alert setAlertStyle: NSWarningAlertStyle];
fLocation.URLByDeletingLastPathComponent.path];
alert.alertStyle = NSWarningAlertStyle;
[alert beginSheetModalForWindow:[self window] completionHandler:nil];
[alert beginSheetModalForWindow:self.window completionHandler:nil];
return;
}
//check if a file with the same name and location already exists
if ([fLocation checkResourceIsReachableAndReturnError: NULL])
{
NSArray * pathComponents = [fLocation pathComponents];
NSInteger count = [pathComponents count];
NSArray * pathComponents = fLocation.pathComponents;
NSInteger count = pathComponents.count;
NSAlert * alert = [[NSAlert alloc] init];
[alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> file already exists warning -> button")];
[alert setMessageText: NSLocalizedString(@"A torrent file with this name and directory cannot be created.",
"Create torrent -> file already exists warning -> title")];
[alert setInformativeText: [NSString stringWithFormat:
alert.messageText = NSLocalizedString(@"A torrent file with this name and directory cannot be created.",
"Create torrent -> file already exists warning -> title");
alert.informativeText = [NSString stringWithFormat:
NSLocalizedString(@"A file with the name \"%@\" already exists in the directory \"%@\". "
"Choose a new name or directory to create the torrent file.",
"Create torrent -> file already exists warning -> warning"),
pathComponents[count-1], pathComponents[count-2]]];
[alert setAlertStyle: NSWarningAlertStyle];
pathComponents[count-1], pathComponents[count-2]];
alert.alertStyle = NSWarningAlertStyle;
[alert beginSheetModalForWindow:[self window] completionHandler:nil];
[alert beginSheetModalForWindow:self.window completionHandler:nil];
return;
}
//parse non-empty tracker strings
tr_tracker_info * trackerInfo = tr_new0(tr_tracker_info, [fTrackers count]);
tr_tracker_info * trackerInfo = tr_new0(tr_tracker_info, fTrackers.count);
for (NSUInteger i = 0; i < [fTrackers count]; i++)
for (NSUInteger i = 0; i < fTrackers.count; i++)
{
trackerInfo[i].announce = (char *)[fTrackers[i] UTF8String];
trackerInfo[i].tier = i;
@ -521,15 +521,15 @@ NSMutableSet *creatorWindowControllerSet = nil;
//store values
[fDefaults setObject: fTrackers forKey: @"CreatorTrackers"];
[fDefaults setBool: [fPrivateCheck state] == NSOnState forKey: @"CreatorPrivate"];
[fDefaults setBool: [fOpenCheck state] == NSOnState forKey: @"CreatorOpen"];
fOpenWhenCreated = [fOpenCheck state] == NSOnState; //need this since the check box might not exist, and value in prefs might have changed from another creator window
[fDefaults setURL: [fLocation URLByDeletingLastPathComponent] forKey: @"CreatorLocationURL"];
[fDefaults setBool: fPrivateCheck.state == NSOnState forKey: @"CreatorPrivate"];
[fDefaults setBool: fOpenCheck.state == NSOnState forKey: @"CreatorOpen"];
fOpenWhenCreated = fOpenCheck.state == NSOnState; //need this since the check box might not exist, and value in prefs might have changed from another creator window
[fDefaults setURL: fLocation.URLByDeletingLastPathComponent forKey: @"CreatorLocationURL"];
[[self window] setRestorable: NO];
self.window.restorable = NO;
[[NSNotificationCenter defaultCenter] postNotificationName: @"BeginCreateTorrentFile" object: fLocation userInfo: nil];
tr_makeMetaInfo(fInfo, [[fLocation path] UTF8String], trackerInfo, [fTrackers count], [[fCommentView string] UTF8String], [fPrivateCheck state] == NSOnState);
[NSNotificationCenter.defaultCenter postNotificationName: @"BeginCreateTorrentFile" object: fLocation userInfo: nil];
tr_makeMetaInfo(fInfo, fLocation.path.UTF8String, trackerInfo, fTrackers.count, fCommentView.string.UTF8String, fPrivateCheck.state == NSOnState);
tr_free(trackerInfo);
fTimer = [NSTimer scheduledTimerWithTimeInterval: 0.1 target: self selector: @selector(checkProgress) userInfo: nil repeats: YES];
@ -548,71 +548,68 @@ NSMutableSet *creatorWindowControllerSet = nil;
case TR_MAKEMETA_OK:
if (fOpenWhenCreated)
{
NSDictionary * dict = [[NSDictionary alloc] initWithObjects: @[
[fLocation path],
[[fPath URLByDeletingLastPathComponent] path]]
forKeys: @[@"File", @"Path"]];
[[NSNotificationCenter defaultCenter] postNotificationName: @"OpenCreatedTorrentFile" object: self userInfo: dict];
NSDictionary * dict = @{@"File": fLocation.path, @"Path": fPath.URLByDeletingLastPathComponent.path};
[NSNotificationCenter.defaultCenter postNotificationName: @"OpenCreatedTorrentFile" object: self userInfo: dict];
}
[[self window] close];
[self.window close];
break;
case TR_MAKEMETA_CANCELLED:
[[self window] close];
[self.window close];
break;
default:
alert = [[NSAlert alloc] init];
[alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> failed -> button")];
[alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Creation of \"%@\" failed.",
"Create torrent -> failed -> title"), [fLocation lastPathComponent]]];
[alert setAlertStyle: NSWarningAlertStyle];
alert.messageText = [NSString stringWithFormat: NSLocalizedString(@"Creation of \"%@\" failed.",
"Create torrent -> failed -> title"), fLocation.lastPathComponent];
alert.alertStyle = NSWarningAlertStyle;
if (fInfo->result == TR_MAKEMETA_IO_READ)
[alert setInformativeText: [NSString stringWithFormat: NSLocalizedString(@"Could not read \"%s\": %s.",
"Create torrent -> failed -> warning"), fInfo->errfile, strerror(fInfo->my_errno)]];
alert.informativeText = [NSString stringWithFormat: NSLocalizedString(@"Could not read \"%s\": %s.",
"Create torrent -> failed -> warning"), fInfo->errfile, strerror(fInfo->my_errno)];
else if (fInfo->result == TR_MAKEMETA_IO_WRITE)
[alert setInformativeText: [NSString stringWithFormat: NSLocalizedString(@"Could not write \"%s\": %s.",
"Create torrent -> failed -> warning"), fInfo->errfile, strerror(fInfo->my_errno)]];
alert.informativeText = [NSString stringWithFormat: NSLocalizedString(@"Could not write \"%s\": %s.",
"Create torrent -> failed -> warning"), fInfo->errfile, strerror(fInfo->my_errno)];
else //invalid url should have been caught before creating
[alert setInformativeText: [NSString stringWithFormat: @"%@ (%d)",
NSLocalizedString(@"An unknown error has occurred.", "Create torrent -> failed -> warning"), fInfo->result]];
alert.informativeText = [NSString stringWithFormat: @"%@ (%d)",
NSLocalizedString(@"An unknown error has occurred.", "Create torrent -> failed -> warning"), fInfo->result];
[alert beginSheetModalForWindow:[self window] completionHandler:^(NSModalResponse returnCode) {
[[alert window] orderOut: nil];
[[self window] close];
[alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
[alert.window orderOut: nil];
[self.window close];
}];
}
}
else
{
[fProgressIndicator setDoubleValue: (double)fInfo->pieceIndex / fInfo->pieceCount];
fProgressIndicator.doubleValue = (double)fInfo->pieceIndex / fInfo->pieceCount;
if (!fStarted)
{
fStarted = YES;
[fProgressView setHidden: YES];
fProgressView.hidden = YES;
NSWindow * window = [self window];
[window setFrameAutosaveName: @""];
NSWindow * window = self.window;
window.frameAutosaveName = @"";
NSRect windowRect = [window frame];
CGFloat difference = [fProgressView frame].size.height - [[window contentView] frame].size.height;
NSRect windowRect = window.frame;
CGFloat difference = fProgressView.frame.size.height - window.contentView.frame.size.height;
windowRect.origin.y -= difference;
windowRect.size.height += difference;
//don't allow vertical resizing
CGFloat height = windowRect.size.height;
[window setMinSize: NSMakeSize([window minSize].width, height)];
[window setMaxSize: NSMakeSize([window maxSize].width, height)];
window.minSize = NSMakeSize(window.minSize.width, height);
window.maxSize = NSMakeSize(window.maxSize.width, height);
[window setContentView: fProgressView];
window.contentView = fProgressView;
[window setFrame: windowRect display: YES animate: YES];
[fProgressView setHidden: NO];
fProgressView.hidden = NO;
[[window standardWindowButton: NSWindowCloseButton] setEnabled: NO];
[window standardWindowButton: NSWindowCloseButton].enabled = NO;
}
}
}

28
macosx/DragOverlayView.m
View File

@ -27,30 +27,26 @@
@implementation DragOverlayView
- (id) initWithFrame: (NSRect) frame
- (instancetype) initWithFrame: (NSRect) frame
{
if ((self = [super initWithFrame: frame]))
{
//create attributes
NSShadow * stringShadow = [[NSShadow alloc] init];
[stringShadow setShadowOffset: NSMakeSize(2.0, -2.0)];
[stringShadow setShadowBlurRadius: 4.0];
stringShadow.shadowOffset = NSMakeSize(2.0, -2.0);
stringShadow.shadowBlurRadius = 4.0;
NSFont * bigFont = [NSFont boldSystemFontOfSize: 18.0],
* smallFont = [NSFont systemFontOfSize: 14.0];
NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
[paragraphStyle setLineBreakMode: NSLineBreakByTruncatingMiddle];
NSMutableParagraphStyle * paragraphStyle = [NSParagraphStyle.defaultParagraphStyle mutableCopy];
paragraphStyle.lineBreakMode = NSLineBreakByTruncatingMiddle;
fMainLineAttributes = [[NSDictionary alloc] initWithObjects: @[[NSColor whiteColor],
bigFont, stringShadow, paragraphStyle]
forKeys: @[NSForegroundColorAttributeName, NSFontAttributeName,
NSShadowAttributeName, NSParagraphStyleAttributeName]];
fMainLineAttributes = @{NSForegroundColorAttributeName: NSColor.whiteColor, NSFontAttributeName: bigFont,
NSShadowAttributeName: stringShadow, NSParagraphStyleAttributeName: paragraphStyle};
fSubLineAttributes = [[NSDictionary alloc] initWithObjects: @[[NSColor whiteColor],
smallFont, stringShadow, paragraphStyle]
forKeys: @[NSForegroundColorAttributeName, NSFontAttributeName,
NSShadowAttributeName, NSParagraphStyleAttributeName]];
fSubLineAttributes = @{NSForegroundColorAttributeName: NSColor.whiteColor, NSFontAttributeName: smallFont,
NSShadowAttributeName: stringShadow, NSParagraphStyleAttributeName: paragraphStyle};
}
return self;
@ -90,15 +86,15 @@
[fBadge unlockFocus];
[self setNeedsDisplay: YES];
self.needsDisplay = YES;
}
-(void) drawRect: (NSRect) rect
{
if (fBadge)
{
const NSRect frame = [self frame];
const NSSize imageSize = [fBadge size];
const NSRect frame = self.frame;
const NSSize imageSize = fBadge.size;
[fBadge drawAtPoint: NSMakePoint((NSWidth(frame) - imageSize.width) * 0.5, (NSHeight(frame) - imageSize.height) * 0.5) fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
}
}

2
macosx/DragOverlayWindow.h
View File

@ -31,7 +31,7 @@
NSViewAnimation * fFadeInAnimation, * fFadeOutAnimation;
}
- (id) initWithLib: (tr_session *) lib forWindow: (NSWindow *) window;
- (instancetype) initWithLib: (tr_session *) lib forWindow: (NSWindow *) window;
- (void) setTorrents: (NSArray *) files;
- (void) setFile: (NSString *) file;

58
macosx/DragOverlayWindow.m
View File

@ -32,41 +32,41 @@
@implementation DragOverlayWindow
- (id) initWithLib: (tr_session *) lib forWindow: (NSWindow *) window
- (instancetype) initWithLib: (tr_session *) lib forWindow: (NSWindow *) window
{
if ((self = ([super initWithContentRect: [window frame] styleMask: NSBorderlessWindowMask
if ((self = ([super initWithContentRect: window.frame styleMask: NSBorderlessWindowMask
backing: NSBackingStoreBuffered defer: NO])))
{
fLib = lib;
[self setBackgroundColor: [NSColor colorWithCalibratedWhite: 0.0 alpha: 0.5]];
[self setAlphaValue: 0.0];
[self setOpaque: NO];
[self setHasShadow: NO];
self.backgroundColor = [NSColor colorWithCalibratedWhite: 0.0 alpha: 0.5];
self.alphaValue = 0.0;
self.opaque = NO;
self.hasShadow = NO;
DragOverlayView * view = [[DragOverlayView alloc] initWithFrame: [self frame]];
[self setContentView: view];
DragOverlayView * view = [[DragOverlayView alloc] initWithFrame: self.frame];
self.contentView = view;
[self setReleasedWhenClosed: NO];
[self setIgnoresMouseEvents: YES];
self.releasedWhenClosed = NO;
self.ignoresMouseEvents = YES;
fFadeInAnimation = [[NSViewAnimation alloc] initWithViewAnimations: @[
@{NSViewAnimationTargetKey: self,
NSViewAnimationEffectKey: NSViewAnimationFadeInEffect}
]];
[fFadeInAnimation setDuration: 0.15];
[fFadeInAnimation setAnimationBlockingMode: NSAnimationNonblockingThreaded];
fFadeInAnimation.duration = 0.15;
fFadeInAnimation.animationBlockingMode = NSAnimationNonblockingThreaded;
fFadeOutAnimation = [[NSViewAnimation alloc] initWithViewAnimations: @[
@{NSViewAnimationTargetKey: self,
NSViewAnimationEffectKey: NSViewAnimationFadeOutEffect}
]];
[fFadeOutAnimation setDuration: 0.5];
[fFadeOutAnimation setAnimationBlockingMode: NSAnimationNonblockingThreaded];
fFadeOutAnimation.duration = 0.5;
fFadeOutAnimation.animationBlockingMode = NSAnimationNonblockingThreaded;
[window addChildWindow: self ordered: NSWindowAbove];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(resizeWindow)
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(resizeWindow)
name: NSWindowDidResizeNotification object: window];
}
return self;
@ -74,7 +74,7 @@
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[NSNotificationCenter.defaultCenter removeObserver: self];
}
- (void) setTorrents: (NSArray *) files
@ -88,11 +88,11 @@
for (NSString * file in files)
{
if ([[[NSWorkspace sharedWorkspace] typeOfFile: file error: NULL] isEqualToString: @"org.bittorrent.torrent"]
|| [[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
if ([[NSWorkspace.sharedWorkspace typeOfFile: file error: NULL] isEqualToString: @"org.bittorrent.torrent"]
|| [file.pathExtension caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
{
tr_ctor * ctor = tr_ctorNew(fLib);
tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
tr_ctorSetMetainfoFromFile(ctor, file.UTF8String);
tr_info info;
if (tr_torrentParse(ctor, &info) == TR_PARSE_OK)
{
@ -130,7 +130,7 @@
NSImage * icon;
if (count == 1)
icon = [[NSWorkspace sharedWorkspace] iconForFileType: folder ? NSFileTypeForHFSTypeCode(kGenericFolderIcon) : [name pathExtension]];
icon = [NSWorkspace.sharedWorkspace iconForFileType: folder ? NSFileTypeForHFSTypeCode(kGenericFolderIcon) : name.pathExtension];
else
{
name = [NSString stringWithFormat: NSLocalizedString(@"%@ Torrent Files", "Drag overlay -> torrents"),
@ -139,20 +139,20 @@
icon = [NSImage imageNamed: @"TransmissionDocument.icns"];
}
[[self contentView] setOverlay: icon mainLine: name subLine: secondString];
[self.contentView setOverlay: icon mainLine: name subLine: secondString];
[self fadeIn];
}
- (void) setFile: (NSString *) file
{
[[self contentView] setOverlay: [NSImage imageNamed: @"CreateLarge"]
[self.contentView setOverlay: [NSImage imageNamed: @"CreateLarge"]
mainLine: NSLocalizedString(@"Create a Torrent File", "Drag overlay -> file") subLine: file];
[self fadeIn];
}
- (void) setURL: (NSString *) url
{
[[self contentView] setOverlay: [NSImage imageNamed: @"Globe"]
[self.contentView setOverlay: [NSImage imageNamed: @"Globe"]
mainLine: NSLocalizedString(@"Web Address", "Drag overlay -> url") subLine: url];
[self fadeIn];
}
@ -160,10 +160,10 @@
- (void) fadeIn
{
//stop other animation and set to same progress
if ([fFadeOutAnimation isAnimating])
if (fFadeOutAnimation.animating)
{
[fFadeOutAnimation stopAnimation];
[fFadeInAnimation setCurrentProgress: 1.0 - [fFadeOutAnimation currentProgress]];
fFadeInAnimation.currentProgress = 1.0 - fFadeOutAnimation.currentProgress;
}
[fFadeInAnimation startAnimation];
}
@ -171,12 +171,12 @@
- (void) fadeOut
{
//stop other animation and set to same progress
if ([fFadeInAnimation isAnimating])
if (fFadeInAnimation.animating)
{
[fFadeInAnimation stopAnimation];
[fFadeOutAnimation setCurrentProgress: 1.0 - [fFadeInAnimation currentProgress]];
fFadeOutAnimation.currentProgress = 1.0 - fFadeInAnimation.currentProgress;
}
if ([self alphaValue] > 0.0)
if (self.alphaValue > 0.0)
[fFadeOutAnimation startAnimation];
}
@ -186,7 +186,7 @@
- (void) resizeWindow
{
[self setFrame: [[self parentWindow] frame] display: NO];
[self setFrame: self.parentWindow.frame display: NO];
}
@end

10
macosx/ExpandedPathToIconTransformer.m
View File

@ -44,14 +44,14 @@
NSString * path = [value stringByExpandingTildeInPath];
NSImage * icon;
//show a folder icon if the folder doesn't exist
if ([[path pathExtension] isEqualToString: @""] && ![[NSFileManager defaultManager] fileExistsAtPath: path])
icon = [[NSWorkspace sharedWorkspace] iconForFileType: NSFileTypeForHFSTypeCode(kGenericFolderIcon)];
if ([path.pathExtension isEqualToString: @""] && ![NSFileManager.defaultManager fileExistsAtPath: path])
icon = [NSWorkspace.sharedWorkspace iconForFileType: NSFileTypeForHFSTypeCode(kGenericFolderIcon)];
else
icon = [[NSWorkspace sharedWorkspace] iconForFile: path];
icon = [NSWorkspace.sharedWorkspace iconForFile: path];
[icon setSize: NSMakeSize(16.0, 16.0)];
icon.size = NSMakeSize(16.0, 16.0);
return icon;
}
@end
@end

4
macosx/ExpandedPathToPathTransformer.m
View File

@ -36,7 +36,7 @@
- (id) transformedValue: (id) value
{
return value == nil ? nil : [[NSFileManager defaultManager] displayNameAtPath: value];
return value == nil ? nil : [NSFileManager.defaultManager displayNameAtPath: value];
}
@end
@end

16
macosx/FileListNode.h
View File

@ -26,25 +26,25 @@
@interface FileListNode : NSObject <NSCopying>
@property (nonatomic, copy, readonly) NSString * name;
@property (nonatomic, copy, readonly) NSString * path;
@property (nonatomic, readonly) NSString * name;
@property (nonatomic, readonly) NSString * path;
@property (nonatomic, weak, readonly) Torrent * torrent;
@property (nonatomic, readonly) uint64_t size;
@property (nonatomic, strong, readonly) NSImage * icon;
@property (nonatomic, readonly) NSImage * icon;
@property (nonatomic, readonly) BOOL isFolder;
@property (nonatomic, strong, readonly) NSMutableArray * children;
@property (nonatomic, readonly) NSMutableArray * children;
@property (nonatomic, strong, readonly) NSIndexSet * indexes;
@property (nonatomic, readonly) NSIndexSet * indexes;
- (id) initWithFolderName: (NSString *) name path: (NSString *) path torrent: (Torrent *) torrent;
- (id) initWithFileName: (NSString *) name path: (NSString *) path size: (uint64_t) size index: (NSUInteger) index torrent: (Torrent *) torrent;
- (instancetype) initWithFolderName: (NSString *) name path: (NSString *) path torrent: (Torrent *) torrent;
- (instancetype) initWithFileName: (NSString *) name path: (NSString *) path size: (uint64_t) size index: (NSUInteger) index torrent: (Torrent *) torrent;
- (void) insertChild: (FileListNode *) child;
- (void) insertIndex: (NSUInteger) index withSize: (uint64_t) size;
- (NSString *) description;
@property (nonatomic, readonly) NSString *description;
- (BOOL) updateFromOldName: (NSString *) oldName toNewName: (NSString *) newName inPath: (NSString *) path;

22
macosx/FileListNode.m
View File

@ -24,7 +24,7 @@
@interface FileListNode (Private)
- (id) initWithFolder: (BOOL) isFolder name: (NSString *) name path: (NSString *) path torrent: (Torrent *) torrent;
- (instancetype) initWithFolder: (BOOL) isFolder name: (NSString *) name path: (NSString *) path torrent: (Torrent *) torrent;
@end
@ -35,7 +35,7 @@
NSMutableArray * _children;
}
- (id) initWithFolderName: (NSString *) name path: (NSString *) path torrent: (Torrent *) torrent
- (instancetype) initWithFolderName: (NSString *) name path: (NSString *) path torrent: (Torrent *) torrent
{
if ((self = [self initWithFolder: YES name: name path: path torrent: torrent]))
{
@ -46,7 +46,7 @@
return self;
}
- (id) initWithFileName: (NSString *) name path: (NSString *) path size: (uint64_t) size index: (NSUInteger) index torrent: (Torrent *) torrent
- (instancetype) initWithFileName: (NSString *) name path: (NSString *) path size: (uint64_t) size index: (NSUInteger) index torrent: (Torrent *) torrent
{
if ((self = [self initWithFolder: NO name: name path: path torrent: torrent]))
{
@ -82,7 +82,7 @@
- (NSString *) description
{
if (!_isFolder)
return [NSString stringWithFormat: @"%@ (%ld)", _name, [_indexes firstIndex]];
return [NSString stringWithFormat: @"%@ (%ld)", _name, _indexes.firstIndex];
else
return [NSString stringWithFormat: @"%@ (folder: %@)", _name, _indexes];
}
@ -90,8 +90,8 @@
- (NSImage *) icon
{
if (!_icon)
_icon = [[NSWorkspace sharedWorkspace] iconForFileType: _isFolder ? NSFileTypeForHFSTypeCode(kGenericFolderIcon)
: [_name pathExtension]];
_icon = [NSWorkspace.sharedWorkspace iconForFileType: _isFolder ? NSFileTypeForHFSTypeCode(kGenericFolderIcon)
: _name.pathExtension];
return _icon;
}
@ -113,8 +113,8 @@
NSParameterAssert(newName != nil);
NSParameterAssert(path != nil);
NSArray * lookupPathComponents = [path pathComponents];
NSArray * thesePathComponents = [self.path pathComponents];
NSArray * lookupPathComponents = path.pathComponents;
NSArray * thesePathComponents = self.path.pathComponents;
if ([lookupPathComponents isEqualToArray: thesePathComponents]) //this node represents what's being renamed
{
@ -125,7 +125,7 @@
return YES;
}
}
else if ([lookupPathComponents count] < [thesePathComponents count]) //what's being renamed is part of this node's path
else if (lookupPathComponents.count < thesePathComponents.count) //what's being renamed is part of this node's path
{
lookupPathComponents = [lookupPathComponents arrayByAddingObject: oldName];
const BOOL allSame = NSNotFound == [lookupPathComponents indexOfObjectWithOptions: NSEnumerationConcurrent passingTest: ^BOOL(NSString * name, NSUInteger idx, BOOL * stop) {
@ -137,7 +137,7 @@
NSString * oldPathPrefix = [path stringByAppendingPathComponent: oldName];
NSString * newPathPrefix = [path stringByAppendingPathComponent: newName];
_path = [_path stringByReplacingCharactersInRange: NSMakeRange(0, [oldPathPrefix length]) withString: newPathPrefix];
_path = [_path stringByReplacingCharactersInRange: NSMakeRange(0, oldPathPrefix.length) withString: newPathPrefix];
return YES;
}
}
@ -149,7 +149,7 @@
@implementation FileListNode (Private)
- (id) initWithFolder: (BOOL) isFolder name: (NSString *) name path: (NSString *) path torrent: (Torrent *) torrent
- (instancetype) initWithFolder: (BOOL) isFolder name: (NSString *) name path: (NSString *) path torrent: (Torrent *) torrent
{
if ((self = [super init]))
{

59
macosx/FileNameCell.m
View File

@ -43,26 +43,26 @@
- (NSRect) rectForTitleWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
- (NSRect) rectForStatusWithString: (NSAttributedString *) string withTitleRect: (NSRect) titleRect inBounds: (NSRect) bounds;
- (NSAttributedString *) attributedTitle;
- (NSAttributedString *) attributedStatus;
@property (nonatomic, readonly) NSAttributedString *attributedTitle;
@property (nonatomic, readonly) NSAttributedString *attributedStatus;
@end
@implementation FileNameCell
- (id) init
- (instancetype) init
{
if ((self = [super init]))
{
NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
[paragraphStyle setLineBreakMode: NSLineBreakByTruncatingMiddle];
NSMutableParagraphStyle * paragraphStyle = [NSParagraphStyle.defaultParagraphStyle mutableCopy];
paragraphStyle.lineBreakMode = NSLineBreakByTruncatingMiddle;
fTitleAttributes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
[NSFont messageFontOfSize: 12.0], NSFontAttributeName,
paragraphStyle, NSParagraphStyleAttributeName, nil];
NSMutableParagraphStyle * statusParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
[statusParagraphStyle setLineBreakMode: NSLineBreakByTruncatingTail];
NSMutableParagraphStyle * statusParagraphStyle = [NSParagraphStyle.defaultParagraphStyle mutableCopy];
statusParagraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
fStatusAttributes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
[NSFont messageFontOfSize: 9.0], NSFontAttributeName,
@ -85,8 +85,8 @@
- (NSImage *) image
{
FileListNode * node = (FileListNode *)[self objectValue];
return [node icon];
FileListNode * node = (FileListNode *)self.objectValue;
return node.icon;
}
- (NSRect) imageRectForBounds: (NSRect) bounds
@ -95,7 +95,7 @@
result.origin.x += PADDING_HORIZONAL;
const CGFloat IMAGE_SIZE = [(FileListNode *)[self objectValue] isFolder] ? IMAGE_FOLDER_SIZE : IMAGE_ICON_SIZE;
const CGFloat IMAGE_SIZE = ((FileListNode *)self.objectValue).isFolder ? IMAGE_FOLDER_SIZE : IMAGE_ICON_SIZE;
result.origin.y += (result.size.height - IMAGE_SIZE) * 0.5;
result.size = NSMakeSize(IMAGE_SIZE, IMAGE_SIZE);
@ -105,40 +105,41 @@
- (void) drawWithFrame: (NSRect) cellFrame inView: (NSView *) controlView
{
//icon
[[self image] drawInRect: [self imageRectForBounds: cellFrame] fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];
[self.image drawInRect: [self imageRectForBounds: cellFrame] fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];
NSColor * titleColor, * statusColor;
if ([self backgroundStyle] == NSBackgroundStyleDark)
titleColor = statusColor = [NSColor whiteColor];
else if ([[(FileListNode *)[self objectValue] torrent] checkForFiles: [(FileListNode *)[self objectValue] indexes]] == NSOffState)
titleColor = statusColor = [NSColor disabledControlTextColor];
FileListNode * node = self.objectValue;
if (self.backgroundStyle == NSBackgroundStyleDark)
titleColor = statusColor = NSColor.whiteColor;
else if ([node.torrent checkForFiles: node.indexes] == NSOffState)
titleColor = statusColor = NSColor.disabledControlTextColor;
else
{
titleColor = [NSColor controlTextColor];
statusColor = [NSColor secondaryLabelColor];
titleColor = NSColor.controlTextColor;
statusColor = NSColor.secondaryLabelColor;
}
fTitleAttributes[NSForegroundColorAttributeName] = titleColor;
fStatusAttributes[NSForegroundColorAttributeName] = statusColor;
//title
NSAttributedString * titleString = [self attributedTitle];
NSAttributedString * titleString = self.attributedTitle;
NSRect titleRect = [self rectForTitleWithString: titleString inBounds: cellFrame];
[titleString drawInRect: titleRect];
//status
NSAttributedString * statusString = [self attributedStatus];
NSAttributedString * statusString = self.attributedStatus;
NSRect statusRect = [self rectForStatusWithString: statusString withTitleRect: titleRect inBounds: cellFrame];
[statusString drawInRect: statusRect];
}
- (NSRect) expansionFrameWithFrame: (NSRect) cellFrame inView: (NSView *) view
{
NSAttributedString * titleString = [self attributedTitle];
NSAttributedString * titleString = self.attributedTitle;
NSRect realRect = [self rectForTitleWithString: titleString inBounds: cellFrame];
if ([titleString size].width > NSWidth(realRect)
&& NSMouseInRect([view convertPoint: [[view window] mouseLocationOutsideOfEventStream] fromView: nil], realRect, [view isFlipped]))
&& NSMouseInRect([view convertPoint: view.window.mouseLocationOutsideOfEventStream fromView: nil], realRect, view.flipped))
{
realRect.size.width = [titleString size].width;
return NSInsetRect(realRect, -PADDING_EXPANSION_FRAME, -PADDING_EXPANSION_FRAME);
@ -152,8 +153,8 @@
cellFrame.origin.x += PADDING_EXPANSION_FRAME;
cellFrame.origin.y += PADDING_EXPANSION_FRAME;
fTitleAttributes[NSForegroundColorAttributeName] = [NSColor controlTextColor];
NSAttributedString * titleString = [self attributedTitle];
fTitleAttributes[NSForegroundColorAttributeName] = NSColor.controlTextColor;
NSAttributedString * titleString = self.attributedTitle;
[titleString drawInRect: cellFrame];
}
@ -167,7 +168,7 @@
//no right padding, so that there's not too much space between this and the priority image
NSRect result;
if (![(FileListNode *)[self objectValue] isFolder])
if (!((FileListNode *)self.objectValue).isFolder)
{
result.origin.x = NSMinX(bounds) + PADDING_HORIZONAL + IMAGE_ICON_SIZE + PADDING_BETWEEN_IMAGE_AND_TITLE;
result.origin.y = NSMinY(bounds) + PADDING_ABOVE_TITLE_FILE;
@ -189,7 +190,7 @@
const NSSize statusSize = [string size];
NSRect result;
if (![(FileListNode *)[self objectValue] isFolder])
if (!((FileListNode *)self.objectValue).isFolder)
{
result.origin.x = NSMinX(titleRect);
result.origin.y = NSMaxY(bounds) - PADDING_BELOW_STATUS_FILE - statusSize.height;
@ -208,20 +209,20 @@
- (NSAttributedString *) attributedTitle
{
NSString * title = [(FileListNode *)[self objectValue] name];
NSString * title = ((FileListNode *)self.objectValue).name;
return [[NSAttributedString alloc] initWithString: title attributes: fTitleAttributes];
}
- (NSAttributedString *) attributedStatus
{
FileListNode * node = (FileListNode *)[self objectValue];
Torrent * torrent = [node torrent];
FileListNode * node = (FileListNode *)self.objectValue;
Torrent * torrent = node.torrent;
const CGFloat progress = [torrent fileProgress: node];
NSString * percentString = [NSString percentString: progress longDecimals: YES];
NSString * status = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@",
"Inspector -> Files tab -> file status string"), percentString, [NSString stringForFileSize: [node size]]];
"Inspector -> Files tab -> file status string"), percentString, [NSString stringForFileSize: node.size]];
return [[NSAttributedString alloc] initWithString: status attributes: fStatusAttributes];
}

2
macosx/FileOutlineController.h
View File

@ -35,7 +35,7 @@
NSString * fFilterText;
}
- (FileOutlineView *) outlineView;
@property (nonatomic, readonly) FileOutlineView *outlineView;
- (void) setTorrent: (Torrent *) torrent;

256
macosx/FileOutlineController.m
View File

@ -34,22 +34,20 @@
#define ROW_SMALL_HEIGHT 18.0
typedef enum
{
typedef NS_ENUM(unsigned int, fileCheckMenuTag) {
FILE_CHECK_TAG,
FILE_UNCHECK_TAG
} fileCheckMenuTag;
};
typedef enum
{
typedef NS_ENUM(unsigned int, filePriorityMenuTag) {
FILE_PRIORITY_HIGH_TAG,
FILE_PRIORITY_NORMAL_TAG,
FILE_PRIORITY_LOW_TAG
} filePriorityMenuTag;
};
@interface FileOutlineController (Private)
- (NSMenu *) menu;
@property (nonatomic, readonly) NSMenu *menu;
- (NSUInteger) findFileNode: (FileListNode *) node inList: (NSArray *) list atIndexes: (NSIndexSet *) range currentParent: (FileListNode *) currentParent finalParent: (FileListNode **) parent;
@ -61,14 +59,14 @@ typedef enum
{
fFileList = [[NSMutableArray alloc] init];
[fOutline setDoubleAction: @selector(revealFile:)];
[fOutline setTarget: self];
fOutline.doubleAction = @selector(revealFile:);
fOutline.target = self;
//set table header tool tips
[[fOutline tableColumnWithIdentifier: @"Check"] setHeaderToolTip: NSLocalizedString(@"Download", "file table -> header tool tip")];
[[fOutline tableColumnWithIdentifier: @"Priority"] setHeaderToolTip: NSLocalizedString(@"Priority", "file table -> header tool tip")];
[fOutline tableColumnWithIdentifier: @"Check"].headerToolTip = NSLocalizedString(@"Download", "file table -> header tool tip");
[fOutline tableColumnWithIdentifier: @"Priority"].headerToolTip = NSLocalizedString(@"Priority", "file table -> header tool tip");
[fOutline setMenu: [self menu]];
fOutline.menu = self.menu;
[self setTorrent: nil];
}
@ -83,7 +81,7 @@ typedef enum
{
fTorrent = torrent;
[fFileList setArray: [fTorrent fileList]];
[fFileList setArray: fTorrent.fileList];
fFilterText = nil;
@ -93,8 +91,8 @@ typedef enum
- (void) setFilterText: (NSString *) text
{
NSArray * components = [text betterComponentsSeparatedByCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
if (!components || [components count] == 0)
NSArray * components = [text betterComponentsSeparatedByCharactersInSet: NSCharacterSet.whitespaceAndNewlineCharacterSet];
if (!components || components.count == 0)
{
text = nil;
components = nil;
@ -111,14 +109,14 @@ typedef enum
NSMutableDictionary * removedIndexesForParents = nil; //ugly, but we can't modify the actual file nodes
NSArray * tempList = !text ? [fTorrent fileList] : [fTorrent flatFileList];
NSArray * tempList = !text ? fTorrent.fileList : fTorrent.flatFileList;
for (FileListNode * item in tempList)
{
__block BOOL filter = NO;
if (components)
{
[components enumerateObjectsWithOptions: NSEnumerationConcurrent usingBlock: ^(id obj, NSUInteger idx, BOOL * stop) {
if ([[item name] rangeOfString: (NSString *)obj options: (NSCaseInsensitiveSearch | NSDiacriticInsensitiveSearch)].location == NSNotFound)
if ([item.name rangeOfString: (NSString *)obj options: (NSCaseInsensitiveSearch | NSDiacriticInsensitiveSearch)].location == NSNotFound)
{
filter = YES;
*stop = YES;
@ -129,7 +127,7 @@ typedef enum
if (!filter)
{
FileListNode * parent = nil;
NSUInteger previousIndex = ![item isFolder] ? [self findFileNode: item inList: fFileList atIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(currentIndex, [fFileList count]-currentIndex)] currentParent: nil finalParent: &parent] : NSNotFound;
NSUInteger previousIndex = !item.isFolder ? [self findFileNode: item inList: fFileList atIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(currentIndex, fFileList.count-currentIndex)] currentParent: nil finalParent: &parent] : NSNotFound;
if (previousIndex == NSNotFound)
{
@ -178,9 +176,9 @@ typedef enum
}
//remove trailing items - those are the unused
if (currentIndex < [fFileList count])
if (currentIndex < fFileList.count)
{
const NSRange removeRange = NSMakeRange(currentIndex, [fFileList count]-currentIndex);
const NSRange removeRange = NSMakeRange(currentIndex, fFileList.count-currentIndex);
[fFileList removeObjectsInRange: removeRange];
[fOutline removeItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: removeRange] inParent: nil withAnimation: NSTableViewAnimationSlideDown];
}
@ -198,54 +196,54 @@ typedef enum
{
[fTorrent updateFileStat];
[fOutline setNeedsDisplay: YES];
fOutline.needsDisplay = YES;
}
- (void) outlineViewSelectionDidChange: (NSNotification *) notification
{
if ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible])
if ([QLPreviewPanel sharedPreviewPanelExists] && [QLPreviewPanel sharedPreviewPanel].visible)
[[QLPreviewPanel sharedPreviewPanel] reloadData];
}
- (NSInteger) outlineView: (NSOutlineView *) outlineView numberOfChildrenOfItem: (id) item
{
if (!item)
return fFileList ? [fFileList count] : 0;
return fFileList ? fFileList.count : 0;
else
{
FileListNode * node = (FileListNode *)item;
return [node isFolder] ? [[node children] count] : 0;
return node.isFolder ? node.children.count : 0;
}
}
- (BOOL) outlineView: (NSOutlineView *) outlineView isItemExpandable: (id) item
{
return [(FileListNode *)item isFolder];
return ((FileListNode *)item).isFolder;
}
- (id) outlineView: (NSOutlineView *) outlineView child: (NSInteger) index ofItem: (id) item
{
return (item ? [(FileListNode *)item children] : fFileList)[index];
return (item ? ((FileListNode *)item).children : fFileList)[index];
}
- (id) outlineView: (NSOutlineView *) outlineView objectValueForTableColumn: (NSTableColumn *) tableColumn byItem: (id) item
{
if ([[tableColumn identifier] isEqualToString: @"Check"])
return @([fTorrent checkForFiles: [(FileListNode *)item indexes]]);
if ([tableColumn.identifier isEqualToString: @"Check"])
return @([fTorrent checkForFiles: ((FileListNode *)item).indexes]);
else
return item;
}
- (void) outlineView: (NSOutlineView *) outlineView willDisplayCell: (id) cell forTableColumn: (NSTableColumn *) tableColumn item: (id) item
{
NSString * identifier = [tableColumn identifier];
NSString * identifier = tableColumn.identifier;
if ([identifier isEqualToString: @"Check"])
[cell setEnabled: [fTorrent canChangeDownloadCheckForFiles: [(FileListNode *)item indexes]]];
[cell setEnabled: [fTorrent canChangeDownloadCheckForFiles: ((FileListNode *)item).indexes]];
else if ([identifier isEqualToString: @"Priority"])
{
[cell setRepresentedObject: item];
NSInteger hoveredRow = [fOutline hoveredRow];
NSInteger hoveredRow = fOutline.hoveredRow;
[(FilePriorityCell *)cell setHovered: hoveredRow != -1 && hoveredRow == [fOutline rowForItem: item]];
}
else;
@ -253,41 +251,43 @@ typedef enum
- (void) outlineView: (NSOutlineView *) outlineView setObjectValue: (id) object forTableColumn: (NSTableColumn *) tableColumn byItem: (id) item
{
NSString * identifier = [tableColumn identifier];
NSString * identifier = tableColumn.identifier;
if ([identifier isEqualToString: @"Check"])
{
NSIndexSet * indexSet;
if ([NSEvent modifierFlags] & NSAlternateKeyMask)
indexSet = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrent fileCount])];
if (NSEvent.modifierFlags & NSAlternateKeyMask)
indexSet = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, fTorrent.fileCount)];
else
indexSet = [(FileListNode *)item indexes];
indexSet = ((FileListNode *)item).indexes;
[fTorrent setFileCheckState: [object intValue] != NSOffState ? NSOnState : NSOffState forIndexes: indexSet];
[fOutline setNeedsDisplay: YES];
fOutline.needsDisplay = YES;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateUI" object: nil];
}
}
- (NSString *) outlineView: (NSOutlineView *) outlineView typeSelectStringForTableColumn: (NSTableColumn *) tableColumn item: (id) item
{
return [(FileListNode *)item name];
return ((FileListNode *)item).name;
}
- (NSString *) outlineView: (NSOutlineView *) outlineView toolTipForCell: (NSCell *) cell rect: (NSRectPointer) rect
tableColumn: (NSTableColumn *) tableColumn item: (id) item mouseLocation: (NSPoint) mouseLocation
{
NSString * ident = [tableColumn identifier];
NSString * ident = tableColumn.identifier;
if ([ident isEqualToString: @"Name"])
{
NSString * path = [fTorrent fileLocation: item];
if (!path)
path = [[(FileListNode *)item path] stringByAppendingPathComponent: [(FileListNode *)item name]];
if (!path) {
FileListNode * node = (FileListNode *)item;
path = [node.path stringByAppendingPathComponent: node.name];
}
return path;
}
else if ([ident isEqualToString: @"Check"])
{
switch ([cell state])
switch (cell.state)
{
case NSOffState:
return NSLocalizedString(@"Don't Download", "files tab -> tooltip");
@ -299,8 +299,8 @@ typedef enum
}
else if ([ident isEqualToString: @"Priority"])
{
NSSet * priorities = [fTorrent filePrioritiesForIndexes: [(FileListNode *)item indexes]];
switch ([priorities count])
NSSet * priorities = [fTorrent filePrioritiesForIndexes: ((FileListNode *)item).indexes];
switch (priorities.count)
{
case 0:
return NSLocalizedString(@"Priority Not Available", "files tab -> tooltip");
@ -326,53 +326,59 @@ typedef enum
- (CGFloat) outlineView: (NSOutlineView *) outlineView heightOfRowByItem: (id) item
{
if ([(FileListNode *)item isFolder])
if (((FileListNode *)item).isFolder)
return ROW_SMALL_HEIGHT;
else
return [outlineView rowHeight];
return outlineView.rowHeight;
}
- (void) setCheck: (id) sender
{
NSInteger state = [sender tag] == FILE_UNCHECK_TAG ? NSOffState : NSOnState;
NSIndexSet * indexSet = [fOutline selectedRowIndexes];
NSIndexSet * indexSet = fOutline.selectedRowIndexes;
NSMutableIndexSet * itemIndexes = [NSMutableIndexSet indexSet];
for (NSInteger i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
[itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]];
for (NSInteger i = indexSet.firstIndex; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
{
FileListNode * item = [fOutline itemAtRow: i];
[itemIndexes addIndexes: item.indexes];
}
[fTorrent setFileCheckState: state forIndexes: itemIndexes];
[fOutline setNeedsDisplay: YES];
fOutline.needsDisplay = YES;
}
- (void) setOnlySelectedCheck: (id) sender
{
NSIndexSet * indexSet = [fOutline selectedRowIndexes];
NSIndexSet * indexSet = fOutline.selectedRowIndexes;
NSMutableIndexSet * itemIndexes = [NSMutableIndexSet indexSet];
for (NSInteger i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
[itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]];
for (NSInteger i = indexSet.firstIndex; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
{
FileListNode * item = [fOutline itemAtRow: i];
[itemIndexes addIndexes: item.indexes];
}
[fTorrent setFileCheckState: NSOnState forIndexes: itemIndexes];
NSMutableIndexSet * remainingItemIndexes = [NSMutableIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrent fileCount])];
NSMutableIndexSet * remainingItemIndexes = [NSMutableIndexSet indexSetWithIndexesInRange: NSMakeRange(0, fTorrent.fileCount)];
[remainingItemIndexes removeIndexes: itemIndexes];
[fTorrent setFileCheckState: NSOffState forIndexes: remainingItemIndexes];
[fOutline setNeedsDisplay: YES];
fOutline.needsDisplay = YES;
}
- (void) checkAll
{
NSIndexSet * indexSet = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrent fileCount])];
NSIndexSet * indexSet = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, fTorrent.fileCount)];
[fTorrent setFileCheckState: NSOnState forIndexes: indexSet];
[fOutline setNeedsDisplay: YES];
fOutline.needsDisplay = YES;
}
- (void) uncheckAll
{
NSIndexSet * indexSet = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrent fileCount])];
NSIndexSet * indexSet = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, fTorrent.fileCount)];
[fTorrent setFileCheckState: NSOffState forIndexes: indexSet];
[fOutline setNeedsDisplay: YES];
fOutline.needsDisplay = YES;
}
- (void) setPriority: (id) sender
@ -390,53 +396,56 @@ typedef enum
priority = TR_PRI_LOW;
}
NSIndexSet * indexSet = [fOutline selectedRowIndexes];
NSIndexSet * indexSet = fOutline.selectedRowIndexes;
NSMutableIndexSet * itemIndexes = [NSMutableIndexSet indexSet];
for (NSInteger i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
[itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]];
for (NSInteger i = indexSet.firstIndex; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
{
FileListNode * item = [fOutline itemAtRow: i];
[itemIndexes addIndexes: item.indexes];
}
[fTorrent setFilePriority: priority forIndexes: itemIndexes];
[fOutline setNeedsDisplay: YES];
fOutline.needsDisplay = YES;
}
- (void) revealFile: (id) sender
{
NSIndexSet * indexes = [fOutline selectedRowIndexes];
NSMutableArray * paths = [NSMutableArray arrayWithCapacity: [indexes count]];
for (NSUInteger i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
NSIndexSet * indexes = fOutline.selectedRowIndexes;
NSMutableArray * paths = [NSMutableArray arrayWithCapacity: indexes.count];
for (NSUInteger i = indexes.firstIndex; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
{
NSString * path = [fTorrent fileLocation: [fOutline itemAtRow: i]];
if (path)
[paths addObject: [NSURL fileURLWithPath: path]];
}
if ([paths count] > 0)
[[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs: paths];
if (paths.count > 0)
[NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs: paths];
}
- (void) renameSelected: (id) sender
{
NSIndexSet * indexes = [fOutline selectedRowIndexes];
NSAssert([indexes count] == 1, @"1 file needs to be selected to rename, but %ld are selected", [indexes count]);
NSIndexSet * indexes = fOutline.selectedRowIndexes;
NSAssert(indexes.count == 1, @"1 file needs to be selected to rename, but %ld are selected", indexes.count);
FileListNode * node = [fOutline itemAtRow: [indexes firstIndex]];
Torrent * torrent = [node torrent];
if (![torrent isFolder])
FileListNode * node = [fOutline itemAtRow: indexes.firstIndex];
Torrent * torrent = node.torrent;
if (!torrent.folder)
{
[FileRenameSheetController presentSheetForTorrent: torrent modalForWindow: [fOutline window] completionHandler: ^(BOOL didRename) {
[FileRenameSheetController presentSheetForTorrent: torrent modalForWindow: fOutline.window completionHandler: ^(BOOL didRename) {
if (didRename)
{
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
[[NSNotificationCenter defaultCenter] postNotificationName: @"ResetInspector" object: self userInfo: @{ @"Torrent" : torrent }];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateQueue" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"ResetInspector" object: self userInfo: @{ @"Torrent" : torrent }];
}
}];
}
else
{
[FileRenameSheetController presentSheetForFileListNode: node modalForWindow: [fOutline window] completionHandler: ^(BOOL didRename) {
[FileRenameSheetController presentSheetForFileListNode: node modalForWindow: fOutline.window completionHandler: ^(BOOL didRename) {
#warning instead of calling reset inspector, just resort?
if (didRename)
[[NSNotificationCenter defaultCenter] postNotificationName: @"ResetInspector" object: self userInfo: @{ @"Torrent" : torrent }];
[NSNotificationCenter.defaultCenter postNotificationName: @"ResetInspector" object: self userInfo: @{ @"Torrent" : torrent }];
}];
}
}
@ -447,12 +456,12 @@ typedef enum
if (!fTorrent)
return NO;
SEL action = [menuItem action];
SEL action = menuItem.action;
if (action == @selector(revealFile:))
{
NSIndexSet * indexSet = [fOutline selectedRowIndexes];
for (NSInteger i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
NSIndexSet * indexSet = fOutline.selectedRowIndexes;
for (NSInteger i = indexSet.firstIndex; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
if ([fTorrent fileLocation: [fOutline itemAtRow: i]] != nil)
return YES;
return NO;
@ -460,43 +469,49 @@ typedef enum
if (action == @selector(setCheck:))
{
if ([fOutline numberOfSelectedRows] == 0)
if (fOutline.numberOfSelectedRows == 0)
return NO;
NSIndexSet * indexSet = [fOutline selectedRowIndexes];
NSIndexSet * indexSet = fOutline.selectedRowIndexes;
NSMutableIndexSet * itemIndexes = [NSMutableIndexSet indexSet];
for (NSInteger i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
[itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]];
for (NSInteger i = indexSet.firstIndex; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
{
FileListNode * node = [fOutline itemAtRow: i];
[itemIndexes addIndexes: node.indexes];
}
NSInteger state = ([menuItem tag] == FILE_CHECK_TAG) ? NSOnState : NSOffState;
NSInteger state = (menuItem.tag == FILE_CHECK_TAG) ? NSOnState : NSOffState;
return [fTorrent checkForFiles: itemIndexes] != state && [fTorrent canChangeDownloadCheckForFiles: itemIndexes];
}
if (action == @selector(setOnlySelectedCheck:))
{
if ([fOutline numberOfSelectedRows] == 0)
if (fOutline.numberOfSelectedRows == 0)
return NO;
NSIndexSet * indexSet = [fOutline selectedRowIndexes];
NSIndexSet * indexSet = fOutline.selectedRowIndexes;
NSMutableIndexSet * itemIndexes = [NSMutableIndexSet indexSet];
for (NSInteger i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
[itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]];
for (NSInteger i = indexSet.firstIndex; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
{
FileListNode * node = [fOutline itemAtRow: i];
[itemIndexes addIndexes: node.indexes];
}
return [fTorrent canChangeDownloadCheckForFiles: itemIndexes];
}
if (action == @selector(setPriority:))
{
if ([fOutline numberOfSelectedRows] == 0)
if (fOutline.numberOfSelectedRows == 0)
{
[menuItem setState: NSOffState];
menuItem.state = NSOffState;
return NO;
}
//determine which priorities are checked
NSIndexSet * indexSet = [fOutline selectedRowIndexes];
NSIndexSet * indexSet = fOutline.selectedRowIndexes;
tr_priority_t priority;
switch ([menuItem tag])
switch (menuItem.tag)
{
case FILE_PRIORITY_HIGH_TAG:
priority = TR_PRI_HIGH;
@ -510,9 +525,10 @@ typedef enum
}
BOOL current = NO, canChange = NO;
for (NSInteger i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
for (NSInteger i = indexSet.firstIndex; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
{
NSIndexSet * fileIndexSet = [[fOutline itemAtRow: i] indexes];
FileListNode * node = [fOutline itemAtRow: i];
NSIndexSet * fileIndexSet = node.indexes;
if (![fTorrent canChangeDownloadCheckForFiles: fileIndexSet])
continue;
@ -524,13 +540,13 @@ typedef enum
}
}
[menuItem setState: current ? NSOnState : NSOffState];
menuItem.state = current ? NSOnState : NSOffState;
return canChange;
}
if (action == @selector(renameSelected:))
{
return [fOutline numberOfSelectedRows] == 1;
return fOutline.numberOfSelectedRows == 1;
}
return YES;
@ -547,20 +563,20 @@ typedef enum
//check and uncheck
NSMenuItem * item = [[NSMenuItem alloc] initWithTitle: NSLocalizedString(@"Check Selected", "File Outline -> Menu")
action: @selector(setCheck:) keyEquivalent: @""];
[item setTarget: self];
[item setTag: FILE_CHECK_TAG];
item.target = self;
item.tag = FILE_CHECK_TAG;
[menu addItem: item];
item = [[NSMenuItem alloc] initWithTitle: NSLocalizedString(@"Uncheck Selected", "File Outline -> Menu")
action: @selector(setCheck:) keyEquivalent: @""];
[item setTarget: self];
[item setTag: FILE_UNCHECK_TAG];
item.target = self;
item.tag = FILE_UNCHECK_TAG;
[menu addItem: item];
//only check selected
item = [[NSMenuItem alloc] initWithTitle: NSLocalizedString(@"Only Check Selected", "File Outline -> Menu")
action: @selector(setOnlySelectedCheck:) keyEquivalent: @""];
[item setTarget: self];
item.target = self;
[menu addItem: item];
[menu addItem: [NSMenuItem separatorItem]];
@ -568,28 +584,28 @@ typedef enum
//priority
item = [[NSMenuItem alloc] initWithTitle: NSLocalizedString(@"Priority", "File Outline -> Menu") action: NULL keyEquivalent: @""];
NSMenu * priorityMenu = [[NSMenu alloc] initWithTitle: @"File Priority Menu"];
[item setSubmenu: priorityMenu];
item.submenu = priorityMenu;
[menu addItem: item];
item = [[NSMenuItem alloc] initWithTitle: NSLocalizedString(@"High", "File Outline -> Priority Menu")
action: @selector(setPriority:) keyEquivalent: @""];
[item setTarget: self];
[item setTag: FILE_PRIORITY_HIGH_TAG];
[item setImage: [NSImage imageNamed: @"PriorityHighTemplate"]];
item.target = self;
item.tag = FILE_PRIORITY_HIGH_TAG;
item.image = [NSImage imageNamed: @"PriorityHighTemplate"];
[priorityMenu addItem: item];
item = [[NSMenuItem alloc] initWithTitle: NSLocalizedString(@"Normal", "File Outline -> Priority Menu")
action: @selector(setPriority:) keyEquivalent: @""];
[item setTarget: self];
[item setTag: FILE_PRIORITY_NORMAL_TAG];
[item setImage: [NSImage imageNamed: @"PriorityNormalTemplate"]];
item.target = self;
item.tag = FILE_PRIORITY_NORMAL_TAG;
item.image = [NSImage imageNamed: @"PriorityNormalTemplate"];
[priorityMenu addItem: item];
item = [[NSMenuItem alloc] initWithTitle: NSLocalizedString(@"Low", "File Outline -> Priority Menu")
action: @selector(setPriority:) keyEquivalent: @""];
[item setTarget: self];
[item setTag: FILE_PRIORITY_LOW_TAG];
[item setImage: [NSImage imageNamed: @"PriorityLowTemplate"]];
item.target = self;
item.tag = FILE_PRIORITY_LOW_TAG;
item.image = [NSImage imageNamed: @"PriorityLowTemplate"];
[priorityMenu addItem: item];
@ -598,7 +614,7 @@ typedef enum
//reveal in finder
item = [[NSMenuItem alloc] initWithTitle: NSLocalizedString(@"Show in Finder", "File Outline -> Menu")
action: @selector(revealFile:) keyEquivalent: @""];
[item setTarget: self];
item.target = self;
[menu addItem: item];
[menu addItem: [NSMenuItem separatorItem]];
@ -606,22 +622,22 @@ typedef enum
//rename
item = [[NSMenuItem alloc] initWithTitle: [NSLocalizedString(@"Rename File", "File Outline -> Menu") stringByAppendingEllipsis]
action: @selector(renameSelected:) keyEquivalent: @""];
[item setTarget: self];
item.target = self;
[menu addItem: item];
return menu;
}
- (NSUInteger) findFileNode: (FileListNode *) node inList: (NSArray *) list atIndexes: (NSIndexSet *) indexes currentParent: (FileListNode *) currentParent finalParent: (FileListNode **) parent
- (NSUInteger) findFileNode: (FileListNode *) node inList: (NSArray *) list atIndexes: (NSIndexSet *) indexes currentParent: (FileListNode *) currentParent finalParent: (FileListNode * __autoreleasing *) parent
{
NSAssert(![node isFolder], @"Looking up folder node!");
NSAssert(!node.isFolder, @"Looking up folder node!");
__block NSUInteger retIndex = NSNotFound;
[list enumerateObjectsAtIndexes: indexes options: NSEnumerationConcurrent usingBlock: ^(FileListNode * checkNode, NSUInteger index, BOOL * stop) {
if ([[checkNode indexes] containsIndex: [[node indexes] firstIndex]])
if ([checkNode.indexes containsIndex: node.indexes.firstIndex])
{
if (![checkNode isFolder])
if (!checkNode.isFolder)
{
NSAssert2([checkNode isEqualTo: node], @"Expected file nodes to be equal: %@ %@", checkNode, node);
@ -630,7 +646,7 @@ typedef enum
}
else
{
const NSUInteger subIndex = [self findFileNode: node inList: [checkNode children] atIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [[checkNode children] count])] currentParent: checkNode finalParent: parent];
const NSUInteger subIndex = [self findFileNode: node inList: checkNode.children atIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, checkNode.children.count)] currentParent: checkNode finalParent: parent];
NSAssert(subIndex != NSNotFound, @"We didn't find an expected file node.");
retIndex = subIndex;
}

2
macosx/FileOutlineView.h
View File

@ -31,6 +31,6 @@
- (NSRect) iconRectForRow: (int) row;
- (NSInteger) hoveredRow;
@property (nonatomic, readonly) NSInteger hoveredRow;
@end

32
macosx/FileOutlineView.m
View File

@ -32,13 +32,13 @@
- (void) awakeFromNib
{
FileNameCell * nameCell = [[FileNameCell alloc] init];
[[self tableColumnWithIdentifier: @"Name"] setDataCell: nameCell];
[self tableColumnWithIdentifier: @"Name"].dataCell = nameCell;
FilePriorityCell * priorityCell = [[FilePriorityCell alloc] init];
[[self tableColumnWithIdentifier: @"Priority"] setDataCell: priorityCell];
[self tableColumnWithIdentifier: @"Priority"].dataCell = priorityCell;
[self setAutoresizesOutlineColumn: NO];
[self setIndentationPerLevel: 14.0];
self.autoresizesOutlineColumn = NO;
self.indentationPerLevel = 14.0;
fMouseRow = -1;
}
@ -46,13 +46,13 @@
- (void) mouseDown: (NSEvent *) event
{
[[self window] makeKeyWindow];
[self.window makeKeyWindow];
[super mouseDown: event];
}
- (NSMenu *) menuForEvent: (NSEvent *) event
{
const NSInteger row = [self rowAtPoint: [self convertPoint: [event locationInWindow] fromView: nil]];
const NSInteger row = [self rowAtPoint: [self convertPoint: event.locationInWindow fromView: nil]];
if (row >= 0)
{
@ -62,7 +62,7 @@
else
[self deselectAll: self];
return [self menu];
return self.menu;
}
- (NSRect) iconRectForRow: (int) row
@ -70,7 +70,7 @@
FileNameCell * cell = (FileNameCell *)[self preparedCellAtColumn: [self columnWithIdentifier: @"Name"] row: row];
NSRect iconRect = [cell imageRectForBounds: [self rectOfRow: row]];
iconRect.origin.x += [self indentationPerLevel] * (CGFloat)([self levelForRow: row] + 1);
iconRect.origin.x += self.indentationPerLevel * (CGFloat)([self levelForRow: row] + 1);
return iconRect;
}
@ -78,17 +78,17 @@
{
[super updateTrackingAreas];
for (NSTrackingArea * area in [self trackingAreas])
for (NSTrackingArea * area in self.trackingAreas)
{
if ([area owner] == self && [area userInfo][@"Row"])
if (area.owner == self && area.userInfo[@"Row"])
[self removeTrackingArea: area];
}
NSRange visibleRows = [self rowsInRect: [self visibleRect]];
NSRange visibleRows = [self rowsInRect: self.visibleRect];
if (visibleRows.length == 0)
return;
NSPoint mouseLocation = [self convertPoint: [[self window] mouseLocationOutsideOfEventStream] fromView: nil];
NSPoint mouseLocation = [self convertPoint: self.window.mouseLocationOutsideOfEventStream fromView: nil];
for (NSInteger row = visibleRows.location, col = [self columnWithIdentifier: @"Priority"]; (NSUInteger)row < NSMaxRange(visibleRows); row++)
{
@ -108,9 +108,9 @@
- (void) mouseEntered: (NSEvent *) event
{
NSNumber * row;
if ((row = ((NSDictionary *)[event userData])[@"Row"]))
if ((row = ((NSDictionary *)event.userData)[@"Row"]))
{
fMouseRow = [row intValue];
fMouseRow = row.intValue;
[self setNeedsDisplayInRect: [self frameOfCellAtColumn: [self columnWithIdentifier: @"Priority"] row: fMouseRow]];
}
}
@ -118,9 +118,9 @@
- (void) mouseExited: (NSEvent *) event
{
NSNumber * row;
if ((row = ((NSDictionary *)[event userData])[@"Row"]))
if ((row = ((NSDictionary *)event.userData)[@"Row"]))
{
[self setNeedsDisplayInRect: [self frameOfCellAtColumn: [self columnWithIdentifier: @"Priority"] row: [row intValue]]];
[self setNeedsDisplayInRect: [self frameOfCellAtColumn: [self columnWithIdentifier: @"Priority"] row: row.intValue]];
fMouseRow = -1;
}
}

45
macosx/FilePriorityCell.m
View File

@ -30,15 +30,15 @@
@implementation FilePriorityCell
- (id) init
- (instancetype) init
{
if ((self = [super init]))
{
[self setTrackingMode: NSSegmentSwitchTrackingSelectAny];
[self setControlSize: NSMiniControlSize];
[self setSegmentCount: 3];
self.trackingMode = NSSegmentSwitchTrackingSelectAny;
self.controlSize = NSMiniControlSize;
self.segmentCount = 3;
for (NSInteger i = 0; i < [self segmentCount]; i++)
for (NSInteger i = 0; i < self.segmentCount; i++)
{
[self setLabel: @"" forSegment: i];
[self setWidth: 9.0f forSegment: i]; //9 is minimum size to get proper look
@ -56,7 +56,7 @@
- (id) copyWithZone: (NSZone *) zone
{
id value = [super copyWithZone: zone];
[value setRepresentedObject: [self representedObject]];
[value setRepresentedObject: self.representedObject];
return value;
}
@ -79,11 +79,12 @@
break;
}
Torrent * torrent = [(FileListNode *)[self representedObject] torrent];
[torrent setFilePriority: priority forIndexes: [(FileListNode *)[self representedObject] indexes]];
FileListNode * node = self.representedObject;
Torrent * torrent = node.torrent;
[torrent setFilePriority: priority forIndexes: node.indexes];
FileOutlineView * controlView = (FileOutlineView *)[self controlView];
[controlView setNeedsDisplay: YES];
FileOutlineView * controlView = (FileOutlineView *)self.controlView;
controlView.needsDisplay = YES;
}
- (void) addTrackingAreasForView: (NSView *) controlView inRect: (NSRect) cellFrame withUserInfo: (NSDictionary *) userInfo
@ -91,7 +92,7 @@
{
NSTrackingAreaOptions options = NSTrackingEnabledDuringMouseDrag | NSTrackingMouseEnteredAndExited | NSTrackingActiveAlways;
if (NSMouseInRect(mouseLocation, cellFrame, [controlView isFlipped]))
if (NSMouseInRect(mouseLocation, cellFrame, controlView.flipped))
{
options |= NSTrackingAssumeInside;
[controlView setNeedsDisplayInRect: cellFrame];
@ -108,11 +109,11 @@
- (void) drawWithFrame: (NSRect) cellFrame inView: (NSView *) controlView
{
FileListNode * node = [self representedObject];
Torrent * torrent = [node torrent];
NSSet * priorities = [torrent filePrioritiesForIndexes: [node indexes]];
FileListNode * node = self.representedObject;
Torrent * torrent = node.torrent;
NSSet * priorities = [torrent filePrioritiesForIndexes: node.indexes];
const NSUInteger count = [priorities count];
const NSUInteger count = priorities.count;
if (fHoverRow && count > 0)
{
[super setSelected: [priorities containsObject: @(TR_PRI_LOW)] forSegment: 0];
@ -130,33 +131,33 @@
{
//if ([self backgroundStyle] != NSBackgroundStyleDark)
{
NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate"] imageWithColor: [NSColor lightGrayColor]];
NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate"] imageWithColor: NSColor.lightGrayColor];
[images addObject: image];
totalWidth = [image size].width;
totalWidth = image.size.width;
}
}
else
{
NSColor * priorityColor = [self backgroundStyle] == NSBackgroundStyleDark ? [NSColor whiteColor] : [NSColor darkGrayColor];
NSColor * priorityColor = self.backgroundStyle == NSBackgroundStyleDark ? NSColor.whiteColor : NSColor.darkGrayColor;
totalWidth = 0.0;
if ([priorities containsObject: @(TR_PRI_LOW)])
{
NSImage * image = [[NSImage imageNamed: @"PriorityLowTemplate"] imageWithColor: priorityColor];
[images addObject: image];
totalWidth += [image size].width;
totalWidth += image.size.width;
}
if ([priorities containsObject: @(TR_PRI_NORMAL)])
{
NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate"] imageWithColor: priorityColor];
[images addObject: image];
totalWidth += [image size].width;
totalWidth += image.size.width;
}
if ([priorities containsObject: @(TR_PRI_HIGH)])
{
NSImage * image = [[NSImage imageNamed: @"PriorityHighTemplate"] imageWithColor: priorityColor];
[images addObject: image];
totalWidth += [image size].width;
totalWidth += image.size.width;
}
}
@ -167,7 +168,7 @@
for (NSImage * image in images)
{
const NSSize imageSize = [image size];
const NSSize imageSize = image.size;
const NSRect imageRect = NSMakeRect(currentWidth, floor(NSMidY(cellFrame) - imageSize.height * 0.5), imageSize.width, imageSize.height);
[image drawInRect: imageRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];

46
macosx/FileRenameSheetController.m
View File

@ -14,8 +14,8 @@ typedef void (^CompletionBlock)(BOOL);
@interface FileRenameSheetController ()
@property (nonatomic, strong) Torrent * torrent;
@property (nonatomic, strong) FileListNode * node;
@property (nonatomic) Torrent * torrent;
@property (nonatomic) FileListNode * node;
@property (nonatomic, copy) CompletionBlock completionHandler;
@property (nonatomic, copy) NSString * originalName;
@ -34,7 +34,7 @@ typedef void (^CompletionBlock)(BOOL);
renamer.torrent = torrent;
renamer.completionHandler = completionHandler;
[NSApp beginSheet: [renamer window] modalForWindow: window modalDelegate: self didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: (__bridge_retained void *)(renamer)];
[NSApp beginSheet: renamer.window modalForWindow: window modalDelegate: self didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: (__bridge_retained void *)(renamer)];
}
+ (void) presentSheetForFileListNode: (FileListNode *) node modalForWindow: (NSWindow *) window completionHandler: (void (^)(BOOL didRename)) completionHandler
@ -44,11 +44,11 @@ typedef void (^CompletionBlock)(BOOL);
FileRenameSheetController * renamer = [[FileRenameSheetController alloc] initWithWindowNibName: @"FileRenameSheetController"];
renamer.torrent = [node torrent];
renamer.torrent = node.torrent;
renamer.node = node;
renamer.completionHandler = completionHandler;
[NSApp beginSheet: [renamer window] modalForWindow: window modalDelegate: self didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: (__bridge_retained void *)(renamer)];
[NSApp beginSheet: renamer.window modalForWindow: window modalDelegate: self didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: (__bridge_retained void *)(renamer)];
}
+ (void) sheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo
@ -66,45 +66,45 @@ typedef void (^CompletionBlock)(BOOL);
{
[super windowDidLoad];
self.originalName = [self.node name] ?: [self.torrent name];
self.originalName = self.node.name ?: self.torrent.name;
NSString * label = [NSString stringWithFormat: NSLocalizedString(@"Rename the file \"%@\":", "rename sheet label"), self.originalName];
[self.labelField setStringValue: label];
self.labelField.stringValue = label;
[self.inputField setStringValue: self.originalName];
[self.renameButton setEnabled: NO];
self.inputField.stringValue = self.originalName;
self.renameButton.enabled = NO;
//resize the buttons so that they're long enough and the same width
const NSRect oldRenameFrame = [self.renameButton frame];
const NSRect oldCancelFrame = [self.cancelButton frame];
const NSRect oldRenameFrame = self.renameButton.frame;
const NSRect oldCancelFrame = self.cancelButton.frame;
//get the extra width of the rename button from the English xib - the width from sizeToFit is too squished
[self.renameButton sizeToFit];
const CGFloat extra = NSWidth(oldRenameFrame) - NSWidth([self.renameButton frame]);
const CGFloat extra = NSWidth(oldRenameFrame) - NSWidth(self.renameButton.frame);
[self.renameButton setTitle: NSLocalizedString(@"Rename", "rename sheet button")];
[self.cancelButton setTitle: NSLocalizedString(@"Cancel", "rename sheet button")];
self.renameButton.title = NSLocalizedString(@"Rename", "rename sheet button");
self.cancelButton.title = NSLocalizedString(@"Cancel", "rename sheet button");
[self.renameButton sizeToFit];
[self.cancelButton sizeToFit];
NSRect newRenameFrame = [self.renameButton frame];
NSRect newCancelFrame = [self.cancelButton frame];
NSRect newRenameFrame = self.renameButton.frame;
NSRect newCancelFrame = self.cancelButton.frame;
newRenameFrame.size.width = MAX(NSWidth(newRenameFrame), NSWidth(newCancelFrame)) + extra;
newCancelFrame.size.width = MAX(NSWidth(newRenameFrame), NSWidth(newCancelFrame)) + extra;
const CGFloat renameWidthIncrease = NSWidth(newRenameFrame) - NSWidth(oldRenameFrame);
newRenameFrame.origin.x -= renameWidthIncrease;
[self.renameButton setFrame:newRenameFrame];
self.renameButton.frame = newRenameFrame;
const CGFloat cancelWidthIncrease = NSWidth(newCancelFrame) - NSWidth(oldCancelFrame);
newCancelFrame.origin.x -= renameWidthIncrease + cancelWidthIncrease;
[self.cancelButton setFrame:newCancelFrame];
self.cancelButton.frame = newCancelFrame;
}
- (IBAction) rename: (id) sender
{
void (^completionHandler)(BOOL) = ^(BOOL didRename) {
if (didRename)
[NSApp endSheet: [self window] returnCode: NSOKButton];
[NSApp endSheet: self.window returnCode: NSOKButton];
else
{
#warning more thorough error
@ -113,19 +113,19 @@ typedef void (^CompletionBlock)(BOOL);
};
if (self.node)
[self.torrent renameFileNode: self.node withName: [self.inputField stringValue] completionHandler: completionHandler];
[self.torrent renameFileNode: self.node withName: self.inputField.stringValue completionHandler: completionHandler];
else
[self.torrent renameTorrent: [self.inputField stringValue] completionHandler: completionHandler];
[self.torrent renameTorrent: self.inputField.stringValue completionHandler: completionHandler];
}
- (IBAction) cancelRename: (id) sender
{
[NSApp endSheet: [self window] returnCode: NSCancelButton];
[NSApp endSheet: self.window returnCode: NSCancelButton];
}
- (void) controlTextDidChange: (NSNotification *) notification
{
[self.renameButton setEnabled: ![[self.inputField stringValue] isEqualToString: @""] && ![[self.inputField stringValue] isEqualToString: self.originalName]];
self.renameButton.enabled = ![self.inputField.stringValue isEqualToString: @""] && ![self.inputField.stringValue isEqualToString: self.originalName];
}
@end

4
macosx/FilterBarController.h
View File

@ -45,7 +45,7 @@
IBOutlet NSPopUpButton * fGroupsButton;
}
- (id) init;
- (instancetype) init;
- (void) setFilter: (id) sender;
- (void) switchFilter: (BOOL) right;
@ -54,7 +54,7 @@
- (void) setGroupFilter: (id) sender;
- (void) reset: (BOOL) updateUI;
- (NSArray *) searchStrings;
@property (nonatomic, readonly) NSArray *searchStrings;
- (void) focusSearchField;
- (void) setCountAll: (NSUInteger) all active: (NSUInteger) active downloading: (NSUInteger) downloading

158
macosx/FilterBarController.m
View File

@ -41,7 +41,7 @@
@implementation FilterBarController
- (id) init
- (instancetype) init
{
return (self = [super initWithNibName: @"FilterBar" bundle: nil]);
}
@ -49,30 +49,30 @@
- (void) awakeFromNib
{
//localizations
[fNoFilterButton setTitle: NSLocalizedString(@"All", "Filter Bar -> filter button")];
[fActiveFilterButton setTitle: NSLocalizedString(@"Active", "Filter Bar -> filter button")];
[fDownloadFilterButton setTitle: NSLocalizedString(@"Downloading", "Filter Bar -> filter button")];
[fSeedFilterButton setTitle: NSLocalizedString(@"Seeding", "Filter Bar -> filter button")];
[fPauseFilterButton setTitle: NSLocalizedString(@"Paused", "Filter Bar -> filter button")];
fNoFilterButton.title = NSLocalizedString(@"All", "Filter Bar -> filter button");
fActiveFilterButton.title = NSLocalizedString(@"Active", "Filter Bar -> filter button");
fDownloadFilterButton.title = NSLocalizedString(@"Downloading", "Filter Bar -> filter button");
fSeedFilterButton.title = NSLocalizedString(@"Seeding", "Filter Bar -> filter button");
fPauseFilterButton.title = NSLocalizedString(@"Paused", "Filter Bar -> filter button");
[[fNoFilterButton cell] setBackgroundStyle: NSBackgroundStyleRaised];
[[fActiveFilterButton cell] setBackgroundStyle: NSBackgroundStyleRaised];
[[fDownloadFilterButton cell] setBackgroundStyle: NSBackgroundStyleRaised];
[[fSeedFilterButton cell] setBackgroundStyle: NSBackgroundStyleRaised];
[[fPauseFilterButton cell] setBackgroundStyle: NSBackgroundStyleRaised];
fNoFilterButton.cell.backgroundStyle = NSBackgroundStyleRaised;
fActiveFilterButton.cell.backgroundStyle = NSBackgroundStyleRaised;
fDownloadFilterButton.cell.backgroundStyle = NSBackgroundStyleRaised;
fSeedFilterButton.cell.backgroundStyle = NSBackgroundStyleRaised;
fPauseFilterButton.cell.backgroundStyle = NSBackgroundStyleRaised;
[[[[fSearchField cell] searchMenuTemplate] itemWithTag: FILTER_TYPE_TAG_NAME] setTitle:
NSLocalizedString(@"Name", "Filter Bar -> filter menu")];
[[[[fSearchField cell] searchMenuTemplate] itemWithTag: FILTER_TYPE_TAG_TRACKER] setTitle:
NSLocalizedString(@"Tracker", "Filter Bar -> filter menu")];
[fSearchField.searchMenuTemplate itemWithTag: FILTER_TYPE_TAG_NAME].title =
NSLocalizedString(@"Name", "Filter Bar -> filter menu");
[fSearchField.searchMenuTemplate itemWithTag: FILTER_TYPE_TAG_TRACKER].title =
NSLocalizedString(@"Tracker", "Filter Bar -> filter menu");
[[[fGroupsButton menu] itemWithTag: GROUP_FILTER_ALL_TAG] setTitle:
NSLocalizedString(@"All Groups", "Filter Bar -> group filter menu")];
[fGroupsButton.menu itemWithTag: GROUP_FILTER_ALL_TAG].title =
NSLocalizedString(@"All Groups", "Filter Bar -> group filter menu");
[self resizeBar];
//set current filter
NSString * filterType = [[NSUserDefaults standardUserDefaults] stringForKey: @"Filter"];
NSString * filterType = [NSUserDefaults.standardUserDefaults stringForKey: @"Filter"];
NSButton * currentFilterButton;
if ([filterType isEqualToString: FILTER_ACTIVE])
@ -87,49 +87,49 @@
{
//safety
if (![filterType isEqualToString: FILTER_NONE])
[[NSUserDefaults standardUserDefaults] setObject: FILTER_NONE forKey: @"Filter"];
[NSUserDefaults.standardUserDefaults setObject: FILTER_NONE forKey: @"Filter"];
currentFilterButton = fNoFilterButton;
}
[currentFilterButton setState: NSOnState];
currentFilterButton.state = NSOnState;
//set filter search type
NSString * filterSearchType = [[NSUserDefaults standardUserDefaults] stringForKey: @"FilterSearchType"];
NSString * filterSearchType = [NSUserDefaults.standardUserDefaults stringForKey: @"FilterSearchType"];
NSMenu * filterSearchMenu = [[fSearchField cell] searchMenuTemplate];
NSMenu * filterSearchMenu = fSearchField.searchMenuTemplate;
NSString * filterSearchTypeTitle;
if ([filterSearchType isEqualToString: FILTER_TYPE_TRACKER])
filterSearchTypeTitle = [[filterSearchMenu itemWithTag: FILTER_TYPE_TAG_TRACKER] title];
filterSearchTypeTitle = [filterSearchMenu itemWithTag: FILTER_TYPE_TAG_TRACKER].title;
else
{
//safety
if (![filterType isEqualToString: FILTER_TYPE_NAME])
[[NSUserDefaults standardUserDefaults] setObject: FILTER_TYPE_NAME forKey: @"FilterSearchType"];
filterSearchTypeTitle = [[filterSearchMenu itemWithTag: FILTER_TYPE_TAG_NAME] title];
[NSUserDefaults.standardUserDefaults setObject: FILTER_TYPE_NAME forKey: @"FilterSearchType"];
filterSearchTypeTitle = [filterSearchMenu itemWithTag: FILTER_TYPE_TAG_NAME].title;
}
[[fSearchField cell] setPlaceholderString: filterSearchTypeTitle];
fSearchField.placeholderString = filterSearchTypeTitle;
NSString * searchString;
if ((searchString = [[NSUserDefaults standardUserDefaults] stringForKey: @"FilterSearchString"]))
[fSearchField setStringValue: searchString];
if ((searchString = [NSUserDefaults.standardUserDefaults stringForKey: @"FilterSearchString"]))
fSearchField.stringValue = searchString;
[self updateGroupsButton];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(resizeBar)
name: NSWindowDidResizeNotification object: [[self view] window]];
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(resizeBar)
name: NSWindowDidResizeNotification object: self.view.window];
//update when groups change
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateGroups:)
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(updateGroups:)
name: @"UpdateGroups" object: nil];
}
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[NSNotificationCenter.defaultCenter removeObserver: self];
}
- (void) setFilter: (id) sender
{
NSString * oldFilterType = [[NSUserDefaults standardUserDefaults] stringForKey: @"Filter"];
NSString * oldFilterType = [NSUserDefaults.standardUserDefaults stringForKey: @"Filter"];
NSButton * prevFilterButton;
if ([oldFilterType isEqualToString: FILTER_PAUSE])
@ -145,7 +145,7 @@
if (sender != prevFilterButton)
{
[prevFilterButton setState: NSOffState];
prevFilterButton.state = NSOffState;
[sender setState: NSOnState];
NSString * filterType;
@ -160,17 +160,17 @@
else
filterType = FILTER_NONE;
[[NSUserDefaults standardUserDefaults] setObject: filterType forKey: @"Filter"];
[NSUserDefaults.standardUserDefaults setObject: filterType forKey: @"Filter"];
}
else
[sender setState: NSOnState];
[[NSNotificationCenter defaultCenter] postNotificationName: @"ApplyFilter" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"ApplyFilter" object: nil];
}
- (void) switchFilter: (BOOL) right
{
NSString * filterType = [[NSUserDefaults standardUserDefaults] stringForKey: @"Filter"];
NSString * filterType = [NSUserDefaults.standardUserDefaults stringForKey: @"Filter"];
NSButton * button;
if ([filterType isEqualToString: FILTER_NONE])
@ -191,18 +191,18 @@
- (void) setSearchText: (id) sender
{
[[NSUserDefaults standardUserDefaults] setObject: [fSearchField stringValue] forKey: @"FilterSearchString"];
[[NSNotificationCenter defaultCenter] postNotificationName: @"ApplyFilter" object: nil];
[NSUserDefaults.standardUserDefaults setObject: fSearchField.stringValue forKey: @"FilterSearchString"];
[NSNotificationCenter.defaultCenter postNotificationName: @"ApplyFilter" object: nil];
}
- (void) focusSearchField
{
[[[self view] window] makeFirstResponder: fSearchField];
[self.view.window makeFirstResponder: fSearchField];
}
- (void) setSearchType: (id) sender
{
NSString * oldFilterType = [[NSUserDefaults standardUserDefaults] stringForKey: @"FilterSearchType"];
NSString * oldFilterType = [NSUserDefaults.standardUserDefaults stringForKey: @"FilterSearchType"];
NSInteger prevTag, currentTag = [sender tag];
if ([oldFilterType isEqualToString: FILTER_TYPE_TRACKER])
@ -218,25 +218,25 @@
else
filterType = FILTER_TYPE_NAME;
[[NSUserDefaults standardUserDefaults] setObject: filterType forKey: @"FilterSearchType"];
[NSUserDefaults.standardUserDefaults setObject: filterType forKey: @"FilterSearchType"];
[[fSearchField cell] setPlaceholderString: [sender title]];
fSearchField.placeholderString = [sender title];
}
[[NSNotificationCenter defaultCenter] postNotificationName: @"ApplyFilter" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"ApplyFilter" object: nil];
}
- (void) setGroupFilter: (id) sender
{
[[NSUserDefaults standardUserDefaults] setInteger: [sender tag] forKey: @"FilterGroup"];
[NSUserDefaults.standardUserDefaults setInteger: [sender tag] forKey: @"FilterGroup"];
[self updateGroupsButton];
[[NSNotificationCenter defaultCenter] postNotificationName: @"ApplyFilter" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"ApplyFilter" object: nil];
}
- (void) reset: (BOOL) updateUI
{
[[NSUserDefaults standardUserDefaults] setInteger: GROUP_FILTER_ALL_TAG forKey: @"FilterGroup"];
[NSUserDefaults.standardUserDefaults setInteger: GROUP_FILTER_ALL_TAG forKey: @"FilterGroup"];
if (updateUI)
{
@ -244,19 +244,19 @@
[self setFilter: fNoFilterButton];
[fSearchField setStringValue: @""];
fSearchField.stringValue = @"";
[self setSearchText: fSearchField];
}
else
{
[[NSUserDefaults standardUserDefaults] setObject: FILTER_NONE forKey: @"Filter"];
[[NSUserDefaults standardUserDefaults] removeObjectForKey: @"FilterSearchString"];
[NSUserDefaults.standardUserDefaults setObject: FILTER_NONE forKey: @"Filter"];
[NSUserDefaults.standardUserDefaults removeObjectForKey: @"FilterSearchString"];
}
}
- (NSArray *) searchStrings
{
return [[fSearchField stringValue] betterComponentsSeparatedByCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
return [fSearchField.stringValue betterComponentsSeparatedByCharactersInSet: NSCharacterSet.whitespaceAndNewlineCharacterSet];
}
- (void) setCountAll: (NSUInteger) all active: (NSUInteger) active downloading: (NSUInteger) downloading
@ -271,14 +271,14 @@
- (void) menuNeedsUpdate: (NSMenu *) menu
{
if (menu == [fGroupsButton menu])
if (menu == fGroupsButton.menu)
{
for (NSInteger i = [menu numberOfItems]-1; i >= 3; i--)
for (NSInteger i = menu.numberOfItems-1; i >= 3; i--)
[menu removeItemAtIndex: i];
NSMenu * groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroupFilter:) isSmall: YES];
NSMenu * groupMenu = [GroupsController.groups groupMenuWithTarget: self action: @selector(setGroupFilter:) isSmall: YES];
const NSInteger groupMenuCount = [groupMenu numberOfItems];
const NSInteger groupMenuCount = groupMenu.numberOfItems;
for (NSInteger i = 0; i < groupMenuCount; i++)
{
NSMenuItem * item = [groupMenu itemAtIndex: 0];
@ -290,27 +290,27 @@
- (BOOL) validateMenuItem: (NSMenuItem *) menuItem
{
const SEL action = [menuItem action];
const SEL action = menuItem.action;
//check proper filter search item
if (action == @selector(setSearchType:))
{
NSString * filterType = [[NSUserDefaults standardUserDefaults] stringForKey: @"FilterSearchType"];
NSString * filterType = [NSUserDefaults.standardUserDefaults stringForKey: @"FilterSearchType"];
BOOL state;
if ([menuItem tag] == FILTER_TYPE_TAG_TRACKER)
if (menuItem.tag == FILTER_TYPE_TAG_TRACKER)
state = [filterType isEqualToString: FILTER_TYPE_TRACKER];
else
state = [filterType isEqualToString: FILTER_TYPE_NAME];
[menuItem setState: state ? NSOnState : NSOffState];
menuItem.state = state ? NSOnState : NSOffState;
return YES;
}
if (action == @selector(setGroupFilter:))
{
[menuItem setState: [menuItem tag] == [[NSUserDefaults standardUserDefaults] integerForKey: @"FilterGroup"]
? NSOnState : NSOffState];
menuItem.state = menuItem.tag == [NSUserDefaults.standardUserDefaults integerForKey: @"FilterGroup"]
? NSOnState : NSOffState;
return YES;
}
@ -330,16 +330,16 @@
[fSeedFilterButton sizeToFit];
[fPauseFilterButton sizeToFit];
NSRect allRect = [fNoFilterButton frame];
NSRect activeRect = [fActiveFilterButton frame];
NSRect downloadRect = [fDownloadFilterButton frame];
NSRect seedRect = [fSeedFilterButton frame];
NSRect pauseRect = [fPauseFilterButton frame];
NSRect allRect = fNoFilterButton.frame;
NSRect activeRect = fActiveFilterButton.frame;
NSRect downloadRect = fDownloadFilterButton.frame;
NSRect seedRect = fSeedFilterButton.frame;
NSRect pauseRect = fPauseFilterButton.frame;
//size search filter to not overlap buttons
NSRect searchFrame = [fSearchField frame];
NSRect searchFrame = fSearchField.frame;
searchFrame.origin.x = NSMaxX(pauseRect) + 5.0;
searchFrame.size.width = NSWidth([[self view] frame]) - searchFrame.origin.x - 5.0;
searchFrame.size.width = NSWidth(self.view.frame) - searchFrame.origin.x - 5.0;
//make sure it is not too long
if (NSWidth(searchFrame) > SEARCH_MAX_WIDTH)
@ -372,18 +372,18 @@
seedRect.origin.x = NSMaxX(downloadRect) + 1.0;
pauseRect.origin.x = NSMaxX(seedRect) + 1.0;
[fNoFilterButton setFrame: allRect];
[fActiveFilterButton setFrame: activeRect];
[fDownloadFilterButton setFrame: downloadRect];
[fSeedFilterButton setFrame: seedRect];
[fPauseFilterButton setFrame: pauseRect];
fNoFilterButton.frame = allRect;
fActiveFilterButton.frame = activeRect;
fDownloadFilterButton.frame = downloadRect;
fSeedFilterButton.frame = seedRect;
fPauseFilterButton.frame = pauseRect;
[fSearchField setFrame: searchFrame];
fSearchField.frame = searchFrame;
}
- (void) updateGroupsButton
{
const NSInteger groupIndex = [[NSUserDefaults standardUserDefaults] integerForKey: @"FilterGroup"];
const NSInteger groupIndex = [NSUserDefaults.standardUserDefaults integerForKey: @"FilterGroup"];
NSImage * icon;
NSString * toolTip;
@ -394,14 +394,14 @@
}
else
{
icon = [[GroupsController groups] imageForIndex: groupIndex];
NSString * groupName = groupIndex != -1 ? [[GroupsController groups] nameForIndex: groupIndex]
icon = [GroupsController.groups imageForIndex: groupIndex];
NSString * groupName = groupIndex != -1 ? [GroupsController.groups nameForIndex: groupIndex]
: NSLocalizedString(@"None", "Groups -> Button");
toolTip = [NSLocalizedString(@"Group", "Groups -> Button") stringByAppendingFormat: @": %@", groupName];
}
[[[fGroupsButton menu] itemAtIndex: 0] setImage: icon];
[fGroupsButton setToolTip: toolTip];
[fGroupsButton.menu itemAtIndex: 0].image = icon;
fGroupsButton.toolTip = toolTip;
}
- (void) updateGroups: (NSNotification *) notification

4
macosx/FilterBarView.m
View File

@ -37,13 +37,13 @@
- (void) drawRect: (NSRect) rect
{
[[NSColor windowBackgroundColor] setFill];
[NSColor.windowBackgroundColor setFill];
NSRectFill(rect);
const NSRect lineBorderRect = NSMakeRect(NSMinX(rect), 0.0, NSWidth(rect), 1.0);
if (NSIntersectsRect(lineBorderRect, rect))
{
[[NSColor gridColor] setFill];
[NSColor.gridColor setFill];
NSRectFill(lineBorderRect);
}
}

6
macosx/FilterButton.m
View File

@ -25,7 +25,7 @@
@implementation FilterButton
- (id) initWithCoder: (NSCoder *) coder
- (instancetype) initWithCoder: (NSCoder *) coder
{
if ((self = [super initWithCoder: coder]))
{
@ -41,9 +41,9 @@
fCount = count;
[self setToolTip: fCount == 1 ? NSLocalizedString(@"1 transfer", "Filter Button -> tool tip")
self.toolTip = fCount == 1 ? NSLocalizedString(@"1 transfer", "Filter Button -> tool tip")
: [NSString stringWithFormat: NSLocalizedString(@"%@ transfers", "Filter Bar Button -> tool tip"),
[NSString formattedUInteger: fCount]]];
[NSString formattedUInteger: fCount]];
}
@end

2
macosx/GlobalOptionsPopoverViewController.h
View File

@ -36,7 +36,7 @@
NSString * fInitialString;
}
- (id) initWithHandle: (tr_session *) handle;
- (instancetype) initWithHandle: (tr_session *) handle;
- (IBAction) updatedDisplayString: (id) sender;

52
macosx/GlobalOptionsPopoverViewController.m
View File

@ -24,13 +24,13 @@
@implementation GlobalOptionsPopoverViewController
- (id) initWithHandle: (tr_session *) handle
- (instancetype) initWithHandle: (tr_session *) handle
{
if ((self = [super initWithNibName: @"GlobalOptionsPopover" bundle: nil]))
{
fHandle = handle;
fDefaults = [NSUserDefaults standardUserDefaults];
fDefaults = NSUserDefaults.standardUserDefaults;
}
return self;
@ -38,25 +38,25 @@
- (void) awakeFromNib
{
[fUploadLimitField setIntValue: [fDefaults integerForKey: @"UploadLimit"]];
[fDownloadLimitField setIntValue: [fDefaults integerForKey: @"DownloadLimit"]];
fUploadLimitField.intValue = [fDefaults integerForKey: @"UploadLimit"];
fDownloadLimitField.intValue = [fDefaults integerForKey: @"DownloadLimit"];
[fRatioStopField setFloatValue: [fDefaults floatForKey: @"RatioLimit"]];
[fIdleStopField setIntegerValue: [fDefaults integerForKey: @"IdleLimitMinutes"]];
fRatioStopField.floatValue = [fDefaults floatForKey: @"RatioLimit"];
fIdleStopField.integerValue = [fDefaults integerForKey: @"IdleLimitMinutes"];
[[self view] setFrameSize: [[self view] fittingSize]];
[self.view setFrameSize: self.view.fittingSize];
}
- (IBAction) updatedDisplayString: (id) sender
{
[[NSNotificationCenter defaultCenter] postNotificationName: @"RefreshTorrentTable" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"RefreshTorrentTable" object: nil];
}
- (IBAction) setDownSpeedSetting: (id) sender
{
tr_sessionLimitSpeed(fHandle, TR_DOWN, [fDefaults boolForKey: @"CheckDownload"]);
[[NSNotificationCenter defaultCenter] postNotificationName: @"SpeedLimitUpdate" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"SpeedLimitUpdate" object: nil];
}
- (IBAction) setDownSpeedLimit: (id) sender
@ -65,16 +65,16 @@
[fDefaults setInteger: limit forKey: @"DownloadLimit"];
tr_sessionSetSpeedLimit_KBps(fHandle, TR_DOWN, limit);
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateSpeedLimitValuesOutsidePrefs" object: nil];
[[NSNotificationCenter defaultCenter] postNotificationName: @"SpeedLimitUpdate" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateSpeedLimitValuesOutsidePrefs" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"SpeedLimitUpdate" object: nil];
}
- (IBAction) setUpSpeedSetting: (id) sender
{
tr_sessionLimitSpeed(fHandle, TR_UP, [fDefaults boolForKey: @"CheckUpload"]);
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateSpeedLimitValuesOutsidePrefs" object: nil];
[[NSNotificationCenter defaultCenter] postNotificationName: @"SpeedLimitUpdate" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateSpeedLimitValuesOutsidePrefs" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"SpeedLimitUpdate" object: nil];
}
- (IBAction) setUpSpeedLimit: (id) sender
@ -83,7 +83,7 @@
[fDefaults setInteger: limit forKey: @"UploadLimit"];
tr_sessionSetSpeedLimit_KBps(fHandle, TR_UP, limit);
[[NSNotificationCenter defaultCenter] postNotificationName: @"SpeedLimitUpdate" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"SpeedLimitUpdate" object: nil];
}
- (IBAction) setRatioStopSetting: (id) sender
@ -91,10 +91,10 @@
tr_sessionSetRatioLimited(fHandle, [fDefaults boolForKey: @"RatioCheck"]);
//reload main table for seeding progress
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateUI" object: nil];
//reload global settings in inspector
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateGlobalOptions" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateGlobalOptions" object: nil];
}
- (IBAction) setRatioStopLimit: (id) sender
@ -103,13 +103,13 @@
[fDefaults setFloat: value forKey: @"RatioLimit"];
tr_sessionSetRatioLimit(fHandle, value);
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateRatioStopValueOutsidePrefs" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateRatioStopValueOutsidePrefs" object: nil];
//reload main table for seeding progress
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateUI" object: nil];
//reload global settings in inspector
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateGlobalOptions" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateGlobalOptions" object: nil];
}
- (IBAction) setIdleStopSetting: (id) sender
@ -117,10 +117,10 @@
tr_sessionSetIdleLimited(fHandle, [fDefaults boolForKey: @"IdleLimitCheck"]);
//reload main table for remaining seeding time
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateUI" object: nil];
//reload global settings in inspector
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateGlobalOptions" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateGlobalOptions" object: nil];
}
- (IBAction) setIdleStopLimit: (id) sender
@ -129,18 +129,18 @@
[fDefaults setInteger: value forKey: @"IdleLimitMinutes"];
tr_sessionSetIdleLimit(fHandle, value);
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateIdleStopValueOutsidePrefs" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateIdleStopValueOutsidePrefs" object: nil];
//reload main table for remaining seeding time
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateUI" object: nil];
//reload global settings in inspector
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateGlobalOptions" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateGlobalOptions" object: nil];
}
- (BOOL) control: (NSControl *) control textShouldBeginEditing: (NSText *) fieldEditor
{
fInitialString = [control stringValue];
fInitialString = control.stringValue;
return YES;
}
@ -150,7 +150,7 @@
NSBeep();
if (fInitialString)
{
[control setStringValue: fInitialString];
control.stringValue = fInitialString;
fInitialString = nil;
}
return NO;

32
macosx/GroupToolbarItem.m
View File

@ -32,42 +32,42 @@
- (void) validate
{
NSSegmentedControl * control = (NSSegmentedControl *)[self view];
NSSegmentedControl * control = (NSSegmentedControl *)self.view;
for (NSInteger i = 0; i < [control segmentCount]; i++)
[control setEnabled: [[self target] validateToolbarItem:
for (NSInteger i = 0; i < control.segmentCount; i++)
[control setEnabled: [self.target validateToolbarItem:
[[NSToolbarItem alloc] initWithItemIdentifier: fIdentifiers[i]]] forSegment: i];
}
- (void) createMenu: (NSArray *) labels
{
NSMenuItem * menuItem = [[NSMenuItem alloc] initWithTitle: [self label] action: NULL keyEquivalent: @""];
NSMenu * menu = [[NSMenu alloc] initWithTitle: [self label]];
[menuItem setSubmenu: menu];
NSMenuItem * menuItem = [[NSMenuItem alloc] initWithTitle: self.label action: NULL keyEquivalent: @""];
NSMenu * menu = [[NSMenu alloc] initWithTitle: self.label];
menuItem.submenu = menu;
[menu setAutoenablesItems: NO];
menu.autoenablesItems = NO;
const NSInteger count = [(NSSegmentedControl *)[self view] segmentCount];
const NSInteger count = ((NSSegmentedControl *)self.view).segmentCount;
for (NSInteger i = 0; i < count; i++)
{
NSMenuItem * addItem = [[NSMenuItem alloc] initWithTitle: labels[i] action: [self action] keyEquivalent: @""];
[addItem setTarget: [self target]];
[addItem setTag: i];
NSMenuItem * addItem = [[NSMenuItem alloc] initWithTitle: labels[i] action: self.action keyEquivalent: @""];
addItem.target = self.target;
addItem.tag = i;
[menu addItem: addItem];
}
[self setMenuFormRepresentation: menuItem];
self.menuFormRepresentation = menuItem;
}
- (NSMenuItem *) menuFormRepresentation
{
NSMenuItem * menuItem = [super menuFormRepresentation];
NSMenuItem * menuItem = super.menuFormRepresentation;
const NSInteger count = [(NSSegmentedControl *)[self view] segmentCount];
const NSInteger count = ((NSSegmentedControl *)self.view).segmentCount;
for (NSInteger i = 0; i < count; i++)
[[[menuItem submenu] itemAtIndex: i] setEnabled: [[self target] validateToolbarItem:
[[NSToolbarItem alloc] initWithItemIdentifier: fIdentifiers[i]]]];
[menuItem.submenu itemAtIndex: i].enabled = [self.target validateToolbarItem:
[[NSToolbarItem alloc] initWithItemIdentifier: fIdentifiers[i]]];
return menuItem;
}

4
macosx/GroupsController.h
View File

@ -29,9 +29,9 @@
NSMutableArray * fGroups;
}
+ (GroupsController *) groups;
@property (nonatomic, class, readonly) GroupsController * groups;
- (NSInteger) numberOfGroups;
@property (nonatomic, readonly) NSInteger numberOfGroups;
- (NSInteger) rowValueForIndex: (NSInteger) index;
- (NSInteger) indexForRow: (NSInteger) row;

88
macosx/GroupsController.m
View File

@ -46,54 +46,54 @@ GroupsController * fGroupsInstance = nil;
return fGroupsInstance;
}
- (id) init
- (instancetype) init
{
if ((self = [super init]))
{
NSData * data;
if ((data = [[NSUserDefaults standardUserDefaults] dataForKey: @"GroupDicts"]))
if ((data = [NSUserDefaults.standardUserDefaults dataForKey: @"GroupDicts"]))
fGroups = [NSKeyedUnarchiver unarchiveObjectWithData: data];
else if ((data = [[NSUserDefaults standardUserDefaults] dataForKey: @"Groups"])) //handle old groups
else if ((data = [NSUserDefaults.standardUserDefaults dataForKey: @"Groups"])) //handle old groups
{
fGroups = [NSUnarchiver unarchiveObjectWithData: data];
[[NSUserDefaults standardUserDefaults] removeObjectForKey: @"Groups"];
[NSUserDefaults.standardUserDefaults removeObjectForKey: @"Groups"];
[self saveGroups];
}
else
{
//default groups
NSMutableDictionary * red = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[NSColor redColor], @"Color",
NSColor.redColor, @"Color",
NSLocalizedString(@"Red", "Groups -> Name"), @"Name",
@0, @"Index", nil];
NSMutableDictionary * orange = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[NSColor orangeColor], @"Color",
NSColor.orangeColor, @"Color",
NSLocalizedString(@"Orange", "Groups -> Name"), @"Name",
@1, @"Index", nil];
NSMutableDictionary * yellow = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[NSColor yellowColor], @"Color",
NSColor.yellowColor, @"Color",
NSLocalizedString(@"Yellow", "Groups -> Name"), @"Name",
@2, @"Index", nil];
NSMutableDictionary * green = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[NSColor greenColor], @"Color",
NSColor.greenColor, @"Color",
NSLocalizedString(@"Green", "Groups -> Name"), @"Name",
@3, @"Index", nil];
NSMutableDictionary * blue = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[NSColor blueColor], @"Color",
NSColor.blueColor, @"Color",
NSLocalizedString(@"Blue", "Groups -> Name"), @"Name",
@4, @"Index", nil];
NSMutableDictionary * purple = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[NSColor purpleColor], @"Color",
NSColor.purpleColor, @"Color",
NSLocalizedString(@"Purple", "Groups -> Name"), @"Name",
@5, @"Index", nil];
NSMutableDictionary * gray = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[NSColor grayColor], @"Color",
NSColor.grayColor, @"Color",
NSLocalizedString(@"Gray", "Groups -> Name"), @"Name",
@6, @"Index", nil];
@ -108,14 +108,14 @@ GroupsController * fGroupsInstance = nil;
- (NSInteger) numberOfGroups
{
return [fGroups count];
return fGroups.count;
}
- (NSInteger) rowValueForIndex: (NSInteger) index
{
if (index != -1)
{
for (NSUInteger i = 0; i < [fGroups count]; i++)
for (NSUInteger i = 0; i < fGroups.count; i++)
if (index == [fGroups[i][@"Index"] integerValue])
return i;
}
@ -139,7 +139,7 @@ GroupsController * fGroupsInstance = nil;
fGroups[orderIndex][@"Name"] = name;
[self saveGroups];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateGroups" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateGroups" object: self];
}
- (NSImage *) imageForIndex: (NSInteger) index
@ -162,8 +162,8 @@ GroupsController * fGroupsInstance = nil;
dict[@"Color"] = color;
[[GroupsController groups] saveGroups];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateGroups" object: self];
[GroupsController.groups saveGroups];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateGroups" object: self];
}
- (BOOL) usesCustomDownloadLocationForIndex: (NSInteger) index
@ -181,7 +181,7 @@ GroupsController * fGroupsInstance = nil;
dict[@"UsesCustomDownloadLocation"] = @(useCustomLocation);
[[GroupsController groups] saveGroups];
[GroupsController.groups saveGroups];
}
- (NSString *) customDownloadLocationForIndex: (NSInteger) index
@ -195,7 +195,7 @@ GroupsController * fGroupsInstance = nil;
NSMutableDictionary * dict = fGroups[[self rowValueForIndex: index]];
dict[@"CustomDownloadLocation"] = location;
[[GroupsController groups] saveGroups];
[GroupsController.groups saveGroups];
}
- (BOOL) usesAutoAssignRulesForIndex: (NSInteger) index
@ -205,7 +205,7 @@ GroupsController * fGroupsInstance = nil;
return NO;
NSNumber * assignRules = fGroups[orderIndex][@"UsesAutoGroupRules"];
return assignRules && [assignRules boolValue];
return assignRules && assignRules.boolValue;
}
- (void) setUsesAutoAssignRules: (BOOL) useAutoAssignRules forIndex: (NSInteger) index
@ -214,7 +214,7 @@ GroupsController * fGroupsInstance = nil;
dict[@"UsesAutoGroupRules"] = @(useAutoAssignRules);
[[GroupsController groups] saveGroups];
[GroupsController.groups saveGroups];
}
- (NSPredicate *) autoAssignRulesForIndex: (NSInteger) index
@ -233,7 +233,7 @@ GroupsController * fGroupsInstance = nil;
if (predicate)
{
dict[@"AutoGroupRules"] = predicate;
[[GroupsController groups] saveGroups];
[GroupsController.groups saveGroups];
}
else
{
@ -245,16 +245,16 @@ GroupsController * fGroupsInstance = nil;
- (void) addNewGroup
{
//find the lowest index
NSMutableIndexSet * candidates = [NSMutableIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fGroups count]+1)];
NSMutableIndexSet * candidates = [NSMutableIndexSet indexSetWithIndexesInRange: NSMakeRange(0, fGroups.count+1)];
for (NSDictionary * dict in fGroups)
[candidates removeIndex: [dict[@"Index"] integerValue]];
const NSInteger index = [candidates firstIndex];
const NSInteger index = candidates.firstIndex;
[fGroups addObject: [NSMutableDictionary dictionaryWithObjectsAndKeys: @(index), @"Index",
[NSColor colorWithCalibratedRed: 0.0 green: 0.65 blue: 1.0 alpha: 1.0], @"Color", @"", @"Name", nil]];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateGroups" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateGroups" object: self];
[self saveGroups];
}
@ -263,13 +263,13 @@ GroupsController * fGroupsInstance = nil;
NSInteger index = [fGroups[row][@"Index"] integerValue];
[fGroups removeObjectAtIndex: row];
[[NSNotificationCenter defaultCenter] postNotificationName: @"GroupValueRemoved" object: self userInfo:
[NSNotificationCenter.defaultCenter postNotificationName: @"GroupValueRemoved" object: self userInfo:
@{@"Index": @(index)}];
if (index == [[NSUserDefaults standardUserDefaults] integerForKey: @"FilterGroup"])
[[NSUserDefaults standardUserDefaults] setInteger: -2 forKey: @"FilterGroup"];
if (index == [NSUserDefaults.standardUserDefaults integerForKey: @"FilterGroup"])
[NSUserDefaults.standardUserDefaults setInteger: -2 forKey: @"FilterGroup"];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateGroups" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateGroups" object: self];
[self saveGroups];
}
@ -278,7 +278,7 @@ GroupsController * fGroupsInstance = nil;
[fGroups moveObjectAtIndex: oldRow toIndex: newRow];
[self saveGroups];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateGroups" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateGroups" object: self];
}
- (NSMenu *) groupMenuWithTarget: (id) target action: (SEL) action isSmall: (BOOL) small
@ -287,39 +287,39 @@ GroupsController * fGroupsInstance = nil;
NSMenuItem * item = [[NSMenuItem alloc] initWithTitle: NSLocalizedString(@"None", "Groups -> Menu") action: action
keyEquivalent: @""];
[item setTarget: target];
[item setTag: -1];
item.target = target;
item.tag = -1;
NSImage * icon = [NSImage imageNamed: @"GroupsNoneTemplate"];
if (small)
{
icon = [icon copy];
[icon setSize: NSMakeSize(ICON_WIDTH_SMALL, ICON_WIDTH_SMALL)];
icon.size = NSMakeSize(ICON_WIDTH_SMALL, ICON_WIDTH_SMALL);
[item setImage: icon];
item.image = icon;
}
else
[item setImage: icon];
item.image = icon;
[menu addItem: item];
for (NSMutableDictionary * dict in fGroups)
{
item = [[NSMenuItem alloc] initWithTitle: dict[@"Name"] action: action keyEquivalent: @""];
[item setTarget: target];
item.target = target;
[item setTag: [dict[@"Index"] integerValue]];
item.tag = [dict[@"Index"] integerValue];
NSImage * icon = [self imageForGroup: dict];
if (small)
{
icon = [icon copy];
[icon setSize: NSMakeSize(ICON_WIDTH_SMALL, ICON_WIDTH_SMALL)];
icon.size = NSMakeSize(ICON_WIDTH_SMALL, ICON_WIDTH_SMALL);
[item setImage: icon];
item.image = icon;
}
else
[item setImage: icon];
item.image = icon;
[menu addItem: item];
}
@ -345,7 +345,7 @@ GroupsController * fGroupsInstance = nil;
- (void) saveGroups
{
//don't archive the icon
NSMutableArray * groups = [NSMutableArray arrayWithCapacity: [fGroups count]];
NSMutableArray * groups = [NSMutableArray arrayWithCapacity: fGroups.count];
for (NSDictionary * dict in fGroups)
{
NSMutableDictionary * tempDict = [dict mutableCopy];
@ -353,7 +353,7 @@ GroupsController * fGroupsInstance = nil;
[groups addObject: tempDict];
}
[[NSUserDefaults standardUserDefaults] setObject: [NSKeyedArchiver archivedDataWithRootObject: groups] forKey: @"GroupDicts"];
[NSUserDefaults.standardUserDefaults setObject: [NSKeyedArchiver archivedDataWithRootObject: groups] forKey: @"GroupDicts"];
}
- (NSImage *) imageForGroup: (NSMutableDictionary *) dict
@ -373,13 +373,13 @@ GroupsController * fGroupsInstance = nil;
//border
NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: [color blendedColorWithFraction: 0.45 ofColor:
[NSColor whiteColor]] endingColor: color];
NSColor.whiteColor] endingColor: color];
[gradient drawInBezierPath: bp angle: 270.0];
//inside
bp = [NSBezierPath bezierPathWithRoundedRect: NSInsetRect(rect, 1.0, 1.0) xRadius: 3.0 yRadius: 3.0];
gradient = [[NSGradient alloc] initWithStartingColor: [color blendedColorWithFraction: 0.75 ofColor: [NSColor whiteColor]]
endingColor: [color blendedColorWithFraction: 0.2 ofColor: [NSColor whiteColor]]];
gradient = [[NSGradient alloc] initWithStartingColor: [color blendedColorWithFraction: 0.75 ofColor: NSColor.whiteColor]
endingColor: [color blendedColorWithFraction: 0.2 ofColor: NSColor.whiteColor]];
[gradient drawInBezierPath: bp angle: 270.0];
[icon unlockFocus];

204
macosx/GroupsPrefsController.m
View File

@ -33,7 +33,7 @@
@interface GroupsPrefsController ()
@property (nonatomic, strong) IBOutlet NSWindow * groupRulesSheetWindow;
@property (nonatomic) IBOutlet NSWindow * groupRulesSheetWindow;
@property (nonatomic, weak) IBOutlet NSPredicateEditor * ruleEditor;
@property (nonatomic, weak) IBOutlet NSLayoutConstraint * ruleEditorHeightConstraint;
@ -63,15 +63,15 @@
- (NSInteger) numberOfRowsInTableView: (NSTableView *) tableview
{
return [[GroupsController groups] numberOfGroups];
return GroupsController.groups.numberOfGroups;
}
- (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) tableColumn row: (NSInteger) row
{
GroupsController * groupsController = [GroupsController groups];
GroupsController * groupsController = GroupsController.groups;
NSInteger groupsIndex = [groupsController indexForRow: row];
NSString * identifier = [tableColumn identifier];
NSString * identifier = tableColumn.identifier;
if ([identifier isEqualToString: @"Color"])
return [groupsController imageForIndex: groupsIndex];
else
@ -85,21 +85,21 @@
- (void) observeValueForKeyPath: (NSString *) keyPath ofObject: (id) object change: (NSDictionary *) change context: (void *) context
{
if (object == fSelectedColorView && [fTableView numberOfSelectedRows] == 1)
if (object == fSelectedColorView && fTableView.numberOfSelectedRows == 1)
{
NSInteger index = [[GroupsController groups] indexForRow: [fTableView selectedRow]];
[[GroupsController groups] setColor: [fSelectedColorView color] forIndex: index];
[fTableView setNeedsDisplay: YES];
NSInteger index = [GroupsController.groups indexForRow: fTableView.selectedRow];
[GroupsController.groups setColor: fSelectedColorView.color forIndex: index];
fTableView.needsDisplay = YES;
}
}
- (void) controlTextDidEndEditing: (NSNotification *) notification
{
if ([notification object] == fSelectedColorNameField)
if (notification.object == fSelectedColorNameField)
{
NSInteger index = [[GroupsController groups] indexForRow: [fTableView selectedRow]];
[[GroupsController groups] setName: [fSelectedColorNameField stringValue] forIndex: index];
[fTableView setNeedsDisplay: YES];
NSInteger index = [GroupsController.groups indexForRow: fTableView.selectedRow];
[GroupsController.groups setName: fSelectedColorNameField.stringValue forIndex: index];
fTableView.needsDisplay = YES;
}
}
@ -113,8 +113,8 @@
- (NSDragOperation) tableView: (NSTableView *) tableView validateDrop: (id <NSDraggingInfo>) info
proposedRow: (NSInteger) row proposedDropOperation: (NSTableViewDropOperation) operation
{
NSPasteboard * pasteboard = [info draggingPasteboard];
if ([[pasteboard types] containsObject: GROUP_TABLE_VIEW_DATA_TYPE])
NSPasteboard * pasteboard = info.draggingPasteboard;
if ([pasteboard.types containsObject: GROUP_TABLE_VIEW_DATA_TYPE])
{
[fTableView setDropRow: row dropOperation: NSTableViewDropAbove];
return NSDragOperationGeneric;
@ -126,18 +126,18 @@
- (BOOL) tableView: (NSTableView *) tableView acceptDrop: (id <NSDraggingInfo>) info row: (NSInteger) newRow
dropOperation: (NSTableViewDropOperation) operation
{
NSPasteboard * pasteboard = [info draggingPasteboard];
if ([[pasteboard types] containsObject: GROUP_TABLE_VIEW_DATA_TYPE])
NSPasteboard * pasteboard = info.draggingPasteboard;
if ([pasteboard.types containsObject: GROUP_TABLE_VIEW_DATA_TYPE])
{
NSIndexSet * indexes = [NSKeyedUnarchiver unarchiveObjectWithData: [pasteboard dataForType: GROUP_TABLE_VIEW_DATA_TYPE]];
NSInteger oldRow = [indexes firstIndex];
NSInteger oldRow = indexes.firstIndex;
if (oldRow < newRow)
newRow--;
[fTableView beginUpdates];
[[GroupsController groups] moveGroupAtRow: oldRow toRow: newRow];
[GroupsController.groups moveGroupAtRow: oldRow toRow: newRow];
[fTableView moveRowAtIndex: oldRow toIndex: newRow];
[fTableView endUpdates];
@ -148,8 +148,8 @@
- (void) addRemoveGroup: (id) sender
{
if ([NSColorPanel sharedColorPanelExists])
[[NSColorPanel sharedColorPanel] close];
if (NSColorPanel.sharedColorPanelExists)
[NSColorPanel.sharedColorPanel close];
NSInteger row;
@ -158,9 +158,9 @@
case ADD_TAG:
[fTableView beginUpdates];
[[GroupsController groups] addNewGroup];
[GroupsController.groups addNewGroup];
row = [fTableView numberOfRows];
row = fTableView.numberOfRows;
[fTableView insertRowsAtIndexes: [NSIndexSet indexSetWithIndex: row] withAnimation: NSTableViewAnimationSlideUp];
[fTableView endUpdates];
@ -168,24 +168,24 @@
[fTableView selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection: NO];
[fTableView scrollRowToVisible: row];
[[fSelectedColorNameField window] makeFirstResponder: fSelectedColorNameField];
[fSelectedColorNameField.window makeFirstResponder: fSelectedColorNameField];
break;
case REMOVE_TAG:
row = [fTableView selectedRow];
row = fTableView.selectedRow;
[fTableView beginUpdates];
[[GroupsController groups] removeGroupWithRowIndex: row];
[GroupsController.groups removeGroupWithRowIndex: row];
[fTableView removeRowsAtIndexes: [NSIndexSet indexSetWithIndex: row] withAnimation: NSTableViewAnimationSlideUp];
[fTableView endUpdates];
if ([fTableView numberOfRows] > 0)
if (fTableView.numberOfRows > 0)
{
if (row == [fTableView numberOfRows])
if (row == fTableView.numberOfRows)
--row;
[fTableView selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection: NO];
[fTableView scrollRowToVisible: row];
@ -201,24 +201,24 @@
{
NSOpenPanel * panel = [NSOpenPanel openPanel];
[panel setPrompt: NSLocalizedString(@"Select", "Preferences -> Open panel prompt")];
[panel setAllowsMultipleSelection: NO];
[panel setCanChooseFiles: NO];
[panel setCanChooseDirectories: YES];
[panel setCanCreateDirectories: YES];
panel.prompt = NSLocalizedString(@"Select", "Preferences -> Open panel prompt");
panel.allowsMultipleSelection = NO;
panel.canChooseFiles = NO;
panel.canChooseDirectories = YES;
panel.canCreateDirectories = YES;
[panel beginSheetModalForWindow: [fCustomLocationPopUp window] completionHandler: ^(NSInteger result) {
const NSInteger index = [[GroupsController groups] indexForRow: [fTableView selectedRow]];
[panel beginSheetModalForWindow: fCustomLocationPopUp.window completionHandler: ^(NSInteger result) {
const NSInteger index = [GroupsController.groups indexForRow: fTableView.selectedRow];
if (result == NSFileHandlingPanelOKButton)
{
NSString * path = [[panel URLs][0] path];
[[GroupsController groups] setCustomDownloadLocation: path forIndex: index];
[[GroupsController groups] setUsesCustomDownloadLocation: YES forIndex: index];
NSString * path = panel.URLs[0].path;
[GroupsController.groups setCustomDownloadLocation: path forIndex: index];
[GroupsController.groups setUsesCustomDownloadLocation: YES forIndex: index];
}
else
{
if (![[GroupsController groups] customDownloadLocationForIndex: index])
[[GroupsController groups] setUsesCustomDownloadLocation: NO forIndex: index];
if (![GroupsController.groups customDownloadLocationForIndex: index])
[GroupsController.groups setUsesCustomDownloadLocation: NO forIndex: index];
}
[self refreshCustomLocationWithSingleGroup];
@ -229,18 +229,18 @@
- (IBAction) toggleUseCustomDownloadLocation: (id) sender
{
NSInteger index = [[GroupsController groups] indexForRow: [fTableView selectedRow]];
if ([fCustomLocationEnableCheck state] == NSOnState)
NSInteger index = [GroupsController.groups indexForRow: fTableView.selectedRow];
if (fCustomLocationEnableCheck.state == NSOnState)
{
if ([[GroupsController groups] customDownloadLocationForIndex: index])
[[GroupsController groups] setUsesCustomDownloadLocation: YES forIndex: index];
if ([GroupsController.groups customDownloadLocationForIndex: index])
[GroupsController.groups setUsesCustomDownloadLocation: YES forIndex: index];
else
[self customDownloadLocationSheetShow: nil];
}
else
[[GroupsController groups] setUsesCustomDownloadLocation: NO forIndex: index];
[GroupsController.groups setUsesCustomDownloadLocation: NO forIndex: index];
[fCustomLocationPopUp setEnabled: ([fCustomLocationEnableCheck state] == NSOnState)];
fCustomLocationPopUp.enabled = (fCustomLocationEnableCheck.state == NSOnState);
}
#pragma mark -
@ -248,30 +248,30 @@
- (IBAction) toggleUseAutoAssignRules: (id) sender
{
NSInteger index = [[GroupsController groups] indexForRow: [fTableView selectedRow]];
if ([fAutoAssignRulesEnableCheck state] == NSOnState)
NSInteger index = [GroupsController.groups indexForRow: fTableView.selectedRow];
if (fAutoAssignRulesEnableCheck.state == NSOnState)
{
if ([[GroupsController groups] autoAssignRulesForIndex: index])
[[GroupsController groups] setUsesAutoAssignRules: YES forIndex: index];
if ([GroupsController.groups autoAssignRulesForIndex: index])
[GroupsController.groups setUsesAutoAssignRules: YES forIndex: index];
else
[self orderFrontRulesSheet: nil];
}
else
[[GroupsController groups] setUsesAutoAssignRules: NO forIndex: index];
[GroupsController.groups setUsesAutoAssignRules: NO forIndex: index];
[fAutoAssignRulesEditButton setEnabled: [fAutoAssignRulesEnableCheck state] == NSOnState];
fAutoAssignRulesEditButton.enabled = fAutoAssignRulesEnableCheck.state == NSOnState;
}
- (IBAction) orderFrontRulesSheet: (id) sender
{
if (!self.groupRulesSheetWindow)
[[NSBundle mainBundle] loadNibNamed: @"GroupRules" owner: self topLevelObjects: NULL];
[NSBundle.mainBundle loadNibNamed: @"GroupRules" owner: self topLevelObjects: NULL];
NSInteger index = [[GroupsController groups] indexForRow: [fTableView selectedRow]];
NSPredicate *predicate = [[GroupsController groups] autoAssignRulesForIndex: index];
[self.ruleEditor setObjectValue: predicate];
NSInteger index = [GroupsController.groups indexForRow: fTableView.selectedRow];
NSPredicate *predicate = [GroupsController.groups autoAssignRulesForIndex: index];
self.ruleEditor.objectValue = predicate;
if ([self.ruleEditor numberOfRows] == 0)
if (self.ruleEditor.numberOfRows == 0)
[self.ruleEditor addRow: nil];
[fTableView.window beginSheet:self.groupRulesSheetWindow completionHandler:nil];
@ -282,12 +282,12 @@
[self.groupRulesSheetWindow orderOut: nil];
[NSApp endSheet: self.groupRulesSheetWindow];
NSInteger index = [[GroupsController groups] indexForRow: [fTableView selectedRow]];
if (![[GroupsController groups] autoAssignRulesForIndex: index])
NSInteger index = [GroupsController.groups indexForRow: fTableView.selectedRow];
if (![GroupsController.groups autoAssignRulesForIndex: index])
{
[[GroupsController groups] setUsesAutoAssignRules: NO forIndex: index];
[fAutoAssignRulesEnableCheck setState: NO];
[fAutoAssignRulesEditButton setEnabled: NO];
[GroupsController.groups setUsesAutoAssignRules: NO forIndex: index];
fAutoAssignRulesEnableCheck.state = NO;
fAutoAssignRulesEditButton.enabled = NO;
}
}
@ -296,28 +296,28 @@
[self.groupRulesSheetWindow orderOut: nil];
[NSApp endSheet: self.groupRulesSheetWindow];
NSInteger index = [[GroupsController groups] indexForRow: [fTableView selectedRow]];
[[GroupsController groups] setUsesAutoAssignRules: YES forIndex: index];
NSInteger index = [GroupsController.groups indexForRow: fTableView.selectedRow];
[GroupsController.groups setUsesAutoAssignRules: YES forIndex: index];
NSPredicate * predicate = [self.ruleEditor objectValue];
[[GroupsController groups] setAutoAssignRules: predicate forIndex: index];
NSPredicate * predicate = self.ruleEditor.objectValue;
[GroupsController.groups setAutoAssignRules: predicate forIndex: index];
[fAutoAssignRulesEnableCheck setState: [[GroupsController groups] usesAutoAssignRulesForIndex: index]];
[fAutoAssignRulesEditButton setEnabled: [fAutoAssignRulesEnableCheck state] == NSOnState];
fAutoAssignRulesEnableCheck.state = [GroupsController.groups usesAutoAssignRulesForIndex: index];
fAutoAssignRulesEditButton.enabled = fAutoAssignRulesEnableCheck.state == NSOnState;
}
- (void) ruleEditorRowsDidChange: (NSNotification *) notification
{
NSScrollView * ruleEditorScrollView = [self.ruleEditor enclosingScrollView];
NSScrollView * ruleEditorScrollView = self.ruleEditor.enclosingScrollView;
const CGFloat rowHeight = [self.ruleEditor rowHeight];
const CGFloat bordersHeight = [ruleEditorScrollView frame].size.height - [ruleEditorScrollView contentSize].height;
const CGFloat rowHeight = self.ruleEditor.rowHeight;
const CGFloat bordersHeight = ruleEditorScrollView.frame.size.height - ruleEditorScrollView.contentSize.height;
const CGFloat requiredRowCount = [self.ruleEditor numberOfRows];
const CGFloat maxVisibleRowCount = (long)((NSHeight([[[self.ruleEditor window] screen] visibleFrame]) * 2 / 3) / rowHeight);
const CGFloat requiredRowCount = self.ruleEditor.numberOfRows;
const CGFloat maxVisibleRowCount = (long)((NSHeight(self.ruleEditor.window.screen.visibleFrame) * 2 / 3) / rowHeight);
[self.ruleEditorHeightConstraint setConstant: MIN(requiredRowCount, maxVisibleRowCount) * rowHeight + bordersHeight];
[ruleEditorScrollView setHasVerticalScroller: requiredRowCount > maxVisibleRowCount];
self.ruleEditorHeightConstraint.constant = MIN(requiredRowCount, maxVisibleRowCount) * rowHeight + bordersHeight;
ruleEditorScrollView.hasVerticalScroller = requiredRowCount > maxVisibleRowCount;
}
@end
@ -326,55 +326,55 @@
- (void) updateSelectedGroup
{
[fAddRemoveControl setEnabled: [fTableView numberOfSelectedRows] > 0 forSegment: REMOVE_TAG];
if ([fTableView numberOfSelectedRows] == 1)
[fAddRemoveControl setEnabled: fTableView.numberOfSelectedRows > 0 forSegment: REMOVE_TAG];
if (fTableView.numberOfSelectedRows == 1)
{
const NSInteger index = [[GroupsController groups] indexForRow: [fTableView selectedRow]];
[fSelectedColorView setColor: [[GroupsController groups] colorForIndex: index]];
[fSelectedColorView setEnabled: YES];
[fSelectedColorNameField setStringValue: [[GroupsController groups] nameForIndex: index]];
[fSelectedColorNameField setEnabled: YES];
const NSInteger index = [GroupsController.groups indexForRow: fTableView.selectedRow];
fSelectedColorView.color = [GroupsController.groups colorForIndex: index];
fSelectedColorView.enabled = YES;
fSelectedColorNameField.stringValue = [GroupsController.groups nameForIndex: index];
fSelectedColorNameField.enabled = YES;
[self refreshCustomLocationWithSingleGroup];
[fAutoAssignRulesEnableCheck setState: [[GroupsController groups] usesAutoAssignRulesForIndex: index]];
[fAutoAssignRulesEnableCheck setEnabled: YES];
[fAutoAssignRulesEditButton setEnabled: ([fAutoAssignRulesEnableCheck state] == NSOnState)];
fAutoAssignRulesEnableCheck.state = [GroupsController.groups usesAutoAssignRulesForIndex: index];
fAutoAssignRulesEnableCheck.enabled = YES;
fAutoAssignRulesEditButton.enabled = (fAutoAssignRulesEnableCheck.state == NSOnState);
}
else
{
[fSelectedColorView setColor: [NSColor whiteColor]];
[fSelectedColorView setEnabled: NO];
[fSelectedColorNameField setStringValue: @""];
[fSelectedColorNameField setEnabled: NO];
[fCustomLocationEnableCheck setEnabled: NO];
[fCustomLocationPopUp setEnabled: NO];
[fAutoAssignRulesEnableCheck setEnabled: NO];
[fAutoAssignRulesEditButton setEnabled: NO];
fSelectedColorView.color = NSColor.whiteColor;
fSelectedColorView.enabled = NO;
fSelectedColorNameField.stringValue = @"";
fSelectedColorNameField.enabled = NO;
fCustomLocationEnableCheck.enabled = NO;
fCustomLocationPopUp.enabled = NO;
fAutoAssignRulesEnableCheck.enabled = NO;
fAutoAssignRulesEditButton.enabled = NO;
}
}
- (void) refreshCustomLocationWithSingleGroup
{
const NSInteger index = [[GroupsController groups] indexForRow: [fTableView selectedRow]];
const NSInteger index = [GroupsController.groups indexForRow: fTableView.selectedRow];
const BOOL hasCustomLocation = [[GroupsController groups] usesCustomDownloadLocationForIndex: index];
[fCustomLocationEnableCheck setState: hasCustomLocation];
[fCustomLocationEnableCheck setEnabled: YES];
[fCustomLocationPopUp setEnabled: hasCustomLocation];
const BOOL hasCustomLocation = [GroupsController.groups usesCustomDownloadLocationForIndex: index];
fCustomLocationEnableCheck.state = hasCustomLocation;
fCustomLocationEnableCheck.enabled = YES;
fCustomLocationPopUp.enabled = hasCustomLocation;
NSString * location = [[GroupsController groups] customDownloadLocationForIndex: index];
NSString * location = [GroupsController.groups customDownloadLocationForIndex: index];
if (location)
{
ExpandedPathToPathTransformer * pathTransformer = [[ExpandedPathToPathTransformer alloc] init];
[[fCustomLocationPopUp itemAtIndex: 0] setTitle: [pathTransformer transformedValue: location]];
[fCustomLocationPopUp itemAtIndex: 0].title = [pathTransformer transformedValue: location];
ExpandedPathToIconTransformer * iconTransformer = [[ExpandedPathToIconTransformer alloc] init];
[[fCustomLocationPopUp itemAtIndex: 0] setImage: [iconTransformer transformedValue: location]];
[fCustomLocationPopUp itemAtIndex: 0].image = [iconTransformer transformedValue: location];
}
else
{
[[fCustomLocationPopUp itemAtIndex: 0] setTitle: @""];
[[fCustomLocationPopUp itemAtIndex: 0] setImage: nil];
[fCustomLocationPopUp itemAtIndex: 0].title = @"";
[fCustomLocationPopUp itemAtIndex: 0].image = nil;
}
}

116
macosx/InfoActivityViewController.m
View File

@ -40,11 +40,11 @@
@implementation InfoActivityViewController
- (id) init
- (instancetype) init
{
if ((self = [super initWithNibName: @"InfoActivityView" bundle: nil]))
{
[self setTitle: NSLocalizedString(@"Activity", "Inspector view -> title")];
self.title = NSLocalizedString(@"Activity", "Inspector view -> title");
}
return self;
@ -61,7 +61,7 @@
CGFloat oldMaxWidth = 0.0, originX, newMaxWidth = 0.0;
for (NSTextField * label in labels)
{
const NSRect oldFrame = [label frame];
const NSRect oldFrame = label.frame;
if (oldFrame.size.width > oldMaxWidth)
{
oldMaxWidth = oldFrame.size.width;
@ -69,37 +69,37 @@
}
[label sizeToFit];
const CGFloat newWidth = [label bounds].size.width;
const CGFloat newWidth = label.bounds.size.width;
if (newWidth > newMaxWidth)
newMaxWidth = newWidth;
}
for (NSTextField * label in labels)
{
NSRect frame = [label frame];
NSRect frame = label.frame;
frame.origin.x = originX + (newMaxWidth - frame.size.width);
[label setFrame: frame];
label.frame = frame;
}
NSArray * fields = @[ fDateAddedField, fDateCompletedField, fDateActivityField, fStateField, fProgressField, fHaveField, fDownloadedTotalField, fUploadedTotalField, fFailedHashField, fRatioField, fDownloadTimeField, fSeedTimeField, fErrorScrollView ];
const CGFloat widthIncrease = newMaxWidth - oldMaxWidth;
for (NSView * field in fields) {
NSRect frame = [field frame];
NSRect frame = field.frame;
frame.origin.x += widthIncrease;
frame.size.width -= widthIncrease;
[field setFrame: frame];
field.frame = frame;
}
//set the click action of the pieces view
#warning after 2.8 just hook this up in the xib
[fPiecesView setAction:@selector(updatePiecesView:)];
[fPiecesView setTarget:self];
fPiecesView.action = @selector(updatePiecesView:);
fPiecesView.target = self;
}
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[NSNotificationCenter.defaultCenter removeObserver: self];
}
- (void) setInfoForTorrents: (NSArray *) torrents
@ -115,7 +115,7 @@
if (!fSet)
[self setupInfo];
const NSInteger numberSelected = [fTorrents count];
const NSInteger numberSelected = fTorrents.count;
if (numberSelected == 0)
return;
@ -123,61 +123,61 @@
NSDate * lastActivity = nil;
for (Torrent * torrent in fTorrents)
{
have += [torrent haveTotal];
haveVerified += [torrent haveVerified];
downloadedTotal += [torrent downloadedTotal];
uploadedTotal += [torrent uploadedTotal];
failedHash += [torrent failedHash];
have += torrent.haveTotal;
haveVerified += torrent.haveVerified;
downloadedTotal += torrent.downloadedTotal;
uploadedTotal += torrent.uploadedTotal;
failedHash += torrent.failedHash;
NSDate * nextLastActivity;
if ((nextLastActivity = [torrent dateActivity]))
if ((nextLastActivity = torrent.dateActivity))
lastActivity = lastActivity ? [lastActivity laterDate: nextLastActivity] : nextLastActivity;
}
if (have == 0)
[fHaveField setStringValue: [NSString stringForFileSize: 0]];
fHaveField.stringValue = [NSString stringForFileSize: 0];
else
{
NSString * verifiedString = [NSString stringWithFormat: NSLocalizedString(@"%@ verified", "Inspector -> Activity tab -> have"),
[NSString stringForFileSize: haveVerified]];
if (have == haveVerified)
[fHaveField setStringValue: verifiedString];
fHaveField.stringValue = verifiedString;
else
[fHaveField setStringValue: [NSString stringWithFormat: @"%@ (%@)", [NSString stringForFileSize: have], verifiedString]];
fHaveField.stringValue = [NSString stringWithFormat: @"%@ (%@)", [NSString stringForFileSize: have], verifiedString];
}
[fDownloadedTotalField setStringValue: [NSString stringForFileSize: downloadedTotal]];
[fUploadedTotalField setStringValue: [NSString stringForFileSize: uploadedTotal]];
[fFailedHashField setStringValue: [NSString stringForFileSize: failedHash]];
fDownloadedTotalField.stringValue = [NSString stringForFileSize: downloadedTotal];
fUploadedTotalField.stringValue = [NSString stringForFileSize: uploadedTotal];
fFailedHashField.stringValue = [NSString stringForFileSize: failedHash];
[fDateActivityField setObjectValue: lastActivity];
fDateActivityField.objectValue = lastActivity;
if (numberSelected == 1)
{
Torrent * torrent = fTorrents[0];
[fStateField setStringValue: [torrent stateString]];
fStateField.stringValue = torrent.stateString;
NSString * progressString = [NSString percentString: [torrent progress] longDecimals: YES];
if ([torrent isFolder])
NSString * progressString = [NSString percentString: torrent.progress longDecimals: YES];
if (torrent.folder)
{
NSString * progressSelectedString = [NSString stringWithFormat:
NSLocalizedString(@"%@ selected", "Inspector -> Activity tab -> progress"),
[NSString percentString: [torrent progressDone] longDecimals: YES]];
[NSString percentString: torrent.progressDone longDecimals: YES]];
progressString = [progressString stringByAppendingFormat: @" (%@)", progressSelectedString];
}
[fProgressField setStringValue: progressString];
fProgressField.stringValue = progressString;
[fRatioField setStringValue: [NSString stringForRatio: [torrent ratio]]];
fRatioField.stringValue = [NSString stringForRatio: torrent.ratio];
NSString * errorMessage = [torrent errorMessage];
if (![errorMessage isEqualToString: [fErrorMessageView string]])
[fErrorMessageView setString: errorMessage];
NSString * errorMessage = torrent.errorMessage;
if (![errorMessage isEqualToString: fErrorMessageView.string])
fErrorMessageView.string = errorMessage;
[fDateCompletedField setObjectValue: [torrent dateCompleted]];
fDateCompletedField.objectValue = torrent.dateCompleted;
//uses a relative date, so can't be set once
[fDateAddedField setObjectValue: [torrent dateAdded]];
fDateAddedField.objectValue = torrent.dateAdded;
static NSDateComponentsFormatter *timeFormatter;
static dispatch_once_t onceToken;
@ -188,14 +188,14 @@
timeFormatter.zeroFormattingBehavior = NSDateComponentsFormatterZeroFormattingBehaviorDropLeading;
});
[fDownloadTimeField setStringValue: [timeFormatter stringFromTimeInterval:[torrent secondsDownloading]]];
[fSeedTimeField setStringValue: [timeFormatter stringFromTimeInterval:[torrent secondsSeeding]]];
fDownloadTimeField.stringValue = [timeFormatter stringFromTimeInterval:torrent.secondsDownloading];
fSeedTimeField.stringValue = [timeFormatter stringFromTimeInterval:torrent.secondsSeeding];
[fPiecesView updateView];
}
else if (numberSelected > 1)
{
[fRatioField setStringValue: [NSString stringForRatio: tr_getRatio(uploadedTotal, downloadedTotal)]];
fRatioField.stringValue = [NSString stringForRatio: tr_getRatio(uploadedTotal, downloadedTotal)];
}
else;
}
@ -203,14 +203,14 @@
- (void) setPiecesView: (id) sender
{
const BOOL availability = [sender selectedSegment] == PIECES_CONTROL_AVAILABLE;
[[NSUserDefaults standardUserDefaults] setBool: availability forKey: @"PiecesViewShowAvailability"];
[NSUserDefaults.standardUserDefaults setBool: availability forKey: @"PiecesViewShowAvailability"];
[self updatePiecesView:nil];
}
- (void) updatePiecesView: (id) sender
{
const BOOL piecesAvailableSegment = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"];
const BOOL piecesAvailableSegment = [NSUserDefaults.standardUserDefaults boolForKey: @"PiecesViewShowAvailability"];
[fPiecesControl setSelected: piecesAvailableSegment forSegment: PIECES_CONTROL_AVAILABLE];
[fPiecesControl setSelected: !piecesAvailableSegment forSegment: PIECES_CONTROL_PROGRESS];
@ -229,44 +229,44 @@
- (void) setupInfo
{
const NSUInteger count = [fTorrents count];
const NSUInteger count = fTorrents.count;
if (count != 1)
{
if (count == 0)
{
[fHaveField setStringValue: @""];
[fDownloadedTotalField setStringValue: @""];
[fUploadedTotalField setStringValue: @""];
[fFailedHashField setStringValue: @""];
[fDateActivityField setObjectValue: @""]; //using [field setStringValue: @""] causes "December 31, 1969 7:00 PM" to be displayed, at least on 10.7.3
[fRatioField setStringValue: @""];
fHaveField.stringValue = @"";
fDownloadedTotalField.stringValue = @"";
fUploadedTotalField.stringValue = @"";
fFailedHashField.stringValue = @"";
fDateActivityField.objectValue = @""; //using [field setStringValue: @""] causes "December 31, 1969 7:00 PM" to be displayed, at least on 10.7.3
fRatioField.stringValue = @"";
}
[fStateField setStringValue: @""];
[fProgressField setStringValue: @""];
fStateField.stringValue = @"";
fProgressField.stringValue = @"";
[fErrorMessageView setString: @""];
fErrorMessageView.string = @"";
//using [field setStringValue: @""] causes "December 31, 1969 7:00 PM" to be displayed, at least on 10.7.3
[fDateAddedField setObjectValue: @""];
[fDateCompletedField setObjectValue: @""];
fDateAddedField.objectValue = @"";
fDateCompletedField.objectValue = @"";
[fDownloadTimeField setStringValue: @""];
[fSeedTimeField setStringValue: @""];
fDownloadTimeField.stringValue = @"";
fSeedTimeField.stringValue = @"";
[fPiecesControl setSelected: NO forSegment: PIECES_CONTROL_AVAILABLE];
[fPiecesControl setSelected: NO forSegment: PIECES_CONTROL_PROGRESS];
[fPiecesControl setEnabled: NO];
fPiecesControl.enabled = NO;
[fPiecesView setTorrent: nil];
}
else
{
Torrent * torrent = fTorrents[0];
const BOOL piecesAvailableSegment = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"];
const BOOL piecesAvailableSegment = [NSUserDefaults.standardUserDefaults boolForKey: @"PiecesViewShowAvailability"];
[fPiecesControl setSelected: piecesAvailableSegment forSegment: PIECES_CONTROL_AVAILABLE];
[fPiecesControl setSelected: !piecesAvailableSegment forSegment: PIECES_CONTROL_PROGRESS];
[fPiecesControl setEnabled: YES];
fPiecesControl.enabled = YES;
[fPiecesView setTorrent: torrent];
}

4
macosx/InfoFileViewController.h
View File

@ -48,8 +48,8 @@
- (IBAction) checkAll: (id) sender;
- (IBAction) uncheckAll: (id) sender;
- (NSArray *) quickLookURLs;
- (BOOL) canQuickLook;
@property (nonatomic, readonly) NSArray *quickLookURLs;
@property (nonatomic, readonly) BOOL canQuickLook;
- (NSRect) quickLookSourceFrameForPreviewItem: (id <QLPreviewItem>) item;
@end

86
macosx/InfoFileViewController.m
View File

@ -36,11 +36,11 @@
@implementation InfoFileViewController
- (id) init
- (instancetype) init
{
if ((self = [super initWithNibName: @"InfoFileView" bundle: nil]))
{
[self setTitle: NSLocalizedString(@"Files", "Inspector view -> title")];
self.title = NSLocalizedString(@"Files", "Inspector view -> title");
}
return self;
@ -48,38 +48,38 @@
- (void) awakeFromNib
{
const CGFloat height = [[NSUserDefaults standardUserDefaults] floatForKey: @"InspectorContentHeightFiles"];
const CGFloat height = [NSUserDefaults.standardUserDefaults floatForKey: @"InspectorContentHeightFiles"];
if (height != 0.0)
{
NSRect viewRect = [[self view] frame];
NSRect viewRect = self.view.frame;
viewRect.size.height = height;
[[self view] setFrame: viewRect];
self.view.frame = viewRect;
}
[[fFileFilterField cell] setPlaceholderString: NSLocalizedString(@"Filter", "inspector -> file filter")];
[fFileFilterField.cell setPlaceholderString: NSLocalizedString(@"Filter", "inspector -> file filter")];
//localize and place all and none buttons
[fCheckAllButton setTitle: NSLocalizedString(@"All", "inspector -> check all")];
[fUncheckAllButton setTitle: NSLocalizedString(@"None", "inspector -> check all")];
fCheckAllButton.title = NSLocalizedString(@"All", "inspector -> check all");
fUncheckAllButton.title = NSLocalizedString(@"None", "inspector -> check all");
NSRect checkAllFrame = [fCheckAllButton frame];
NSRect uncheckAllFrame = [fUncheckAllButton frame];
NSRect checkAllFrame = fCheckAllButton.frame;
NSRect uncheckAllFrame = fUncheckAllButton.frame;
const CGFloat oldAllWidth = checkAllFrame.size.width;
const CGFloat oldNoneWidth = uncheckAllFrame.size.width;
[fCheckAllButton sizeToFit];
[fUncheckAllButton sizeToFit];
const CGFloat newWidth = MAX([fCheckAllButton bounds].size.width, [fUncheckAllButton bounds].size.width);
const CGFloat newWidth = MAX(fCheckAllButton.bounds.size.width, fUncheckAllButton.bounds.size.width);
const CGFloat uncheckAllChange = newWidth - oldNoneWidth;
uncheckAllFrame.size.width = newWidth;
uncheckAllFrame.origin.x -= uncheckAllChange;
[fUncheckAllButton setFrame: uncheckAllFrame];
fUncheckAllButton.frame = uncheckAllFrame;
const CGFloat checkAllChange = newWidth - oldAllWidth;
checkAllFrame.size.width = newWidth;
checkAllFrame.origin.x -= (checkAllChange + uncheckAllChange);
[fCheckAllButton setFrame: checkAllFrame];
fCheckAllButton.frame = checkAllFrame;
}
@ -96,24 +96,24 @@
if (!fSet)
[self setupInfo];
if ([fTorrents count] == 1)
if (fTorrents.count == 1)
{
[fFileController refresh];
#warning use TorrentFileCheckChange notification as well
Torrent * torrent = fTorrents[0];
if ([torrent isFolder])
if (torrent.folder)
{
const NSInteger filesCheckState = [torrent checkForFiles: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [torrent fileCount])]];
[fCheckAllButton setEnabled: filesCheckState != NSOnState]; //if anything is unchecked
[fUncheckAllButton setEnabled: ![torrent allDownloaded]]; //if there are any checked files that aren't finished
const NSInteger filesCheckState = [torrent checkForFiles: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, torrent.fileCount)]];
fCheckAllButton.enabled = filesCheckState != NSOnState; //if anything is unchecked
fUncheckAllButton.enabled = !torrent.allDownloaded; //if there are any checked files that aren't finished
}
}
}
- (void) saveViewSize
{
[[NSUserDefaults standardUserDefaults] setFloat: NSHeight([[self view] frame]) forKey: @"InspectorContentHeightFiles"];
[NSUserDefaults.standardUserDefaults setFloat: NSHeight(self.view.frame) forKey: @"InspectorContentHeightFiles"];
}
- (void) setFileFilterText: (id) sender
@ -133,12 +133,12 @@
- (NSArray *) quickLookURLs
{
FileOutlineView * fileOutlineView = [fFileController outlineView];
FileOutlineView * fileOutlineView = fFileController.outlineView;
Torrent * torrent = fTorrents[0];
NSIndexSet * indexes = [fileOutlineView selectedRowIndexes];
NSMutableArray * urlArray = [NSMutableArray arrayWithCapacity: [indexes count]];
NSIndexSet * indexes = fileOutlineView.selectedRowIndexes;
NSMutableArray * urlArray = [NSMutableArray arrayWithCapacity: indexes.count];
for (NSUInteger i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
for (NSUInteger i = indexes.firstIndex; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
{
FileListNode * item = [fileOutlineView itemAtRow: i];
if ([self canQuickLookFile: item])
@ -150,17 +150,17 @@
- (BOOL) canQuickLook
{
if ([fTorrents count] != 1)
if (fTorrents.count != 1)
return NO;
Torrent * torrent = fTorrents[0];
if (![torrent isFolder])
if (!torrent.folder)
return NO;
FileOutlineView * fileOutlineView = [fFileController outlineView];
NSIndexSet * indexes = [fileOutlineView selectedRowIndexes];
FileOutlineView * fileOutlineView = fFileController.outlineView;
NSIndexSet * indexes = fileOutlineView.selectedRowIndexes;
for (NSUInteger i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
for (NSUInteger i = indexes.firstIndex; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
if ([self canQuickLookFile: [fileOutlineView itemAtRow: i]])
return YES;
@ -169,11 +169,11 @@
- (NSRect) quickLookSourceFrameForPreviewItem: (id <QLPreviewItem>) item
{
FileOutlineView * fileOutlineView = [fFileController outlineView];
FileOutlineView * fileOutlineView = fFileController.outlineView;
NSString * fullPath = [(NSURL *)item path];
NSString * fullPath = ((NSURL *)item).path;
Torrent * torrent = fTorrents[0];
NSRange visibleRows = [fileOutlineView rowsInRect: [fileOutlineView bounds]];
NSRange visibleRows = [fileOutlineView rowsInRect: fileOutlineView.bounds];
for (NSUInteger row = visibleRows.location; row < NSMaxRange(visibleRows); row++)
{
@ -182,11 +182,11 @@
{
NSRect frame = [fileOutlineView iconRectForRow: row];
if (!NSIntersectsRect([fileOutlineView visibleRect], frame))
if (!NSIntersectsRect(fileOutlineView.visibleRect, frame))
return NSZeroRect;
frame.origin = [fileOutlineView convertPoint: frame.origin toView: nil];
frame = [[[self view] window] convertRectToScreen: frame];
frame = [self.view.window convertRectToScreen: frame];
frame.origin.y -= frame.size.height;
return frame;
}
@ -201,31 +201,31 @@
- (void) setupInfo
{
[fFileFilterField setStringValue: @""];
fFileFilterField.stringValue = @"";
if ([fTorrents count] == 1)
if (fTorrents.count == 1)
{
Torrent * torrent = fTorrents[0];
[fFileController setTorrent: torrent];
const BOOL isFolder = [torrent isFolder];
[fFileFilterField setEnabled: isFolder];
const BOOL isFolder = torrent.folder;
fFileFilterField.enabled = isFolder;
if (!isFolder)
{
[fCheckAllButton setEnabled: NO];
[fUncheckAllButton setEnabled: NO];
fCheckAllButton.enabled = NO;
fUncheckAllButton.enabled = NO;
}
}
else
{
[fFileController setTorrent: nil];
[fFileFilterField setEnabled: NO];
fFileFilterField.enabled = NO;
[fCheckAllButton setEnabled: NO];
[fUncheckAllButton setEnabled: NO];
fCheckAllButton.enabled = NO;
fUncheckAllButton.enabled = NO;
}
fSet = YES;
@ -234,7 +234,7 @@
- (BOOL) canQuickLookFile: (FileListNode *) item
{
Torrent * torrent = fTorrents[0];
return ([item isFolder] || [torrent fileProgress: item] >= 1.0) && [torrent fileLocation: item];
return (item.isFolder || [torrent fileProgress: item] >= 1.0) && [torrent fileLocation: item];
}
@end

78
macosx/InfoGeneralViewController.m
View File

@ -32,11 +32,11 @@
@implementation InfoGeneralViewController
- (id) init
- (instancetype) init
{
if ((self = [super initWithNibName: @"InfoGeneralView" bundle: nil]))
{
[self setTitle: NSLocalizedString(@"General Info", "Inspector view -> title")];
self.title = NSLocalizedString(@"General Info", "Inspector view -> title");
}
return self;
@ -54,7 +54,7 @@
CGFloat oldMaxWidth = 0.0, originX, newMaxWidth = 0.0;
for (NSTextField * label in labels)
{
const NSRect oldFrame = [label frame];
const NSRect oldFrame = label.frame;
if (oldFrame.size.width > oldMaxWidth)
{
oldMaxWidth = oldFrame.size.width;
@ -62,26 +62,26 @@
}
[label sizeToFit];
const CGFloat newWidth = [label bounds].size.width;
const CGFloat newWidth = label.bounds.size.width;
if (newWidth > newMaxWidth)
newMaxWidth = newWidth;
}
for (NSTextField * label in labels)
{
NSRect frame = [label frame];
NSRect frame = label.frame;
frame.origin.x = originX + (newMaxWidth - frame.size.width);
[label setFrame: frame];
label.frame = frame;
}
NSArray * fields = @[ fPiecesField, fHashField, fSecureField, fCreatorField, fDateCreatedField, fCommentScrollView, fDataLocationField ];
const CGFloat widthIncrease = newMaxWidth - oldMaxWidth;
for (NSView * field in fields) {
NSRect frame = [field frame];
NSRect frame = field.frame;
frame.origin.x += widthIncrease;
frame.size.width -= widthIncrease;
[field setFrame: frame];
field.frame = frame;
}
}
@ -98,27 +98,27 @@
if (!fSet)
[self setupInfo];
if ([fTorrents count] != 1)
if (fTorrents.count != 1)
return;
Torrent * torrent = fTorrents[0];
NSString * location = [torrent dataLocation];
[fDataLocationField setStringValue: location ? [location stringByAbbreviatingWithTildeInPath] : @""];
[fDataLocationField setToolTip: location ? location : @""];
NSString * location = torrent.dataLocation;
fDataLocationField.stringValue = location ? location.stringByAbbreviatingWithTildeInPath : @"";
fDataLocationField.toolTip = location ? location : @"";
[fRevealDataButton setHidden: !location];
fRevealDataButton.hidden = !location;
}
- (void) revealDataFile: (id) sender
{
Torrent * torrent = fTorrents[0];
NSString * location = [torrent dataLocation];
NSString * location = torrent.dataLocation;
if (!location)
return;
NSURL * file = [NSURL fileURLWithPath: location];
[[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs: @[file]];
[NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs: @[file]];
}
@end
@ -127,44 +127,44 @@
- (void) setupInfo
{
if ([fTorrents count] == 1)
if (fTorrents.count == 1)
{
Torrent * torrent = fTorrents[0];
#warning candidate for localizedStringWithFormat (although then we'll get two commas)
NSString * piecesString = ![torrent isMagnet] ? [NSString stringWithFormat: @"%ld, %@", [torrent pieceCount],
[NSString stringForFileSize: [torrent pieceSize]]] : @"";
[fPiecesField setStringValue: piecesString];
NSString * piecesString = !torrent.magnet ? [NSString stringWithFormat: @"%ld, %@", torrent.pieceCount,
[NSString stringForFileSize: torrent.pieceSize]] : @"";
fPiecesField.stringValue = piecesString;
NSString * hashString = [torrent hashString];
[fHashField setStringValue: hashString];
[fHashField setToolTip: hashString];
[fSecureField setStringValue: [torrent privateTorrent]
NSString * hashString = torrent.hashString;
fHashField.stringValue = hashString;
fHashField.toolTip = hashString;
fSecureField.stringValue = torrent.privateTorrent
? NSLocalizedString(@"Private Torrent, non-tracker peer discovery disabled", "Inspector -> private torrent")
: NSLocalizedString(@"Public Torrent", "Inspector -> private torrent")];
: NSLocalizedString(@"Public Torrent", "Inspector -> private torrent");
NSString * commentString = [torrent comment];
[fCommentView setString: commentString];
NSString * commentString = torrent.comment;
fCommentView.string = commentString;
NSString * creatorString = [torrent creator];
[fCreatorField setStringValue: creatorString];
[fDateCreatedField setObjectValue: [torrent dateCreated]];
NSString * creatorString = torrent.creator;
fCreatorField.stringValue = creatorString;
fDateCreatedField.objectValue = torrent.dateCreated;
}
else
{
[fPiecesField setStringValue: @""];
[fHashField setStringValue: @""];
[fHashField setToolTip: nil];
[fSecureField setStringValue: @""];
[fCommentView setString: @""];
fPiecesField.stringValue = @"";
fHashField.stringValue = @"";
fHashField.toolTip = nil;
fSecureField.stringValue = @"";
fCommentView.string = @"";
[fCreatorField setStringValue: @""];
[fDateCreatedField setStringValue: @""];
fCreatorField.stringValue = @"";
fDateCreatedField.stringValue = @"";
[fDataLocationField setStringValue: @""];
[fDataLocationField setToolTip: nil];
fDataLocationField.stringValue = @"";
fDataLocationField.toolTip = nil;
[fRevealDataButton setHidden: YES];
fRevealDataButton.hidden = YES;
}
fSet = YES;

250
macosx/InfoOptionsViewController.m
View File

@ -44,11 +44,11 @@
@implementation InfoOptionsViewController
- (id) init
- (instancetype) init
{
if ((self = [super initWithNibName: @"InfoOptionsView" bundle: nil]))
{
[self setTitle: NSLocalizedString(@"Options", "Inspector view -> title")];
self.title = NSLocalizedString(@"Options", "Inspector view -> title");
}
return self;
@ -58,13 +58,13 @@
{
[self setGlobalLabels];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(setGlobalLabels) name: @"UpdateGlobalOptions" object: nil];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateOptionsNotification:) name: @"UpdateOptionsNotification" object: nil];
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(setGlobalLabels) name: @"UpdateGlobalOptions" object: nil];
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(updateOptionsNotification:) name: @"UpdateOptionsNotification" object: nil];
}
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[NSNotificationCenter.defaultCenter removeObserver: self];
}
- (void) setInfoForTorrents: (NSArray *) torrents
@ -85,7 +85,7 @@
- (void) updateOptions
{
if ([fTorrents count] == 0)
if (fTorrents.count == 0)
return;
//get bandwidth info
@ -96,7 +96,7 @@
uploadSpeedLimit = [torrent speedLimit: YES],
downloadUseSpeedLimit = [torrent usesSpeedLimit: NO] ? NSOnState : NSOffState,
downloadSpeedLimit = [torrent speedLimit: NO],
globalUseSpeedLimit = [torrent usesGlobalSpeedLimit] ? NSOnState : NSOffState;
globalUseSpeedLimit = torrent.usesGlobalSpeedLimit ? NSOnState : NSOffState;
while ((torrent = [enumerator nextObject])
&& (uploadUseSpeedLimit != NSMixedState || uploadSpeedLimit != INVALID
@ -115,61 +115,61 @@
if (downloadSpeedLimit != INVALID && downloadSpeedLimit != [torrent speedLimit: NO])
downloadSpeedLimit = INVALID;
if (globalUseSpeedLimit != NSMixedState && globalUseSpeedLimit != ([torrent usesGlobalSpeedLimit] ? NSOnState : NSOffState))
if (globalUseSpeedLimit != NSMixedState && globalUseSpeedLimit != (torrent.usesGlobalSpeedLimit ? NSOnState : NSOffState))
globalUseSpeedLimit = NSMixedState;
}
//set upload view
[fUploadLimitCheck setState: uploadUseSpeedLimit];
[fUploadLimitCheck setEnabled: YES];
fUploadLimitCheck.state = uploadUseSpeedLimit;
fUploadLimitCheck.enabled = YES;
[fUploadLimitLabel setEnabled: uploadUseSpeedLimit == NSOnState];
[fUploadLimitField setEnabled: uploadUseSpeedLimit == NSOnState];
fUploadLimitLabel.enabled = uploadUseSpeedLimit == NSOnState;
fUploadLimitField.enabled = uploadUseSpeedLimit == NSOnState;
if (uploadSpeedLimit != INVALID)
[fUploadLimitField setIntValue: uploadSpeedLimit];
fUploadLimitField.intValue = uploadSpeedLimit;
else
[fUploadLimitField setStringValue: @""];
fUploadLimitField.stringValue = @"";
//set download view
[fDownloadLimitCheck setState: downloadUseSpeedLimit];
[fDownloadLimitCheck setEnabled: YES];
fDownloadLimitCheck.state = downloadUseSpeedLimit;
fDownloadLimitCheck.enabled = YES;
[fDownloadLimitLabel setEnabled: downloadUseSpeedLimit == NSOnState];
[fDownloadLimitField setEnabled: downloadUseSpeedLimit == NSOnState];
fDownloadLimitLabel.enabled = downloadUseSpeedLimit == NSOnState;
fDownloadLimitField.enabled = downloadUseSpeedLimit == NSOnState;
if (downloadSpeedLimit != INVALID)
[fDownloadLimitField setIntValue: downloadSpeedLimit];
fDownloadLimitField.intValue = downloadSpeedLimit;
else
[fDownloadLimitField setStringValue: @""];
fDownloadLimitField.stringValue = @"";
//set global check
[fGlobalLimitCheck setState: globalUseSpeedLimit];
[fGlobalLimitCheck setEnabled: YES];
fGlobalLimitCheck.state = globalUseSpeedLimit;
fGlobalLimitCheck.enabled = YES;
//get ratio and idle info
enumerator = [fTorrents objectEnumerator];
torrent = [enumerator nextObject]; //first torrent
NSInteger checkRatio = [torrent ratioSetting], checkIdle = [torrent idleSetting],
removeWhenFinishSeeding = [torrent removeWhenFinishSeeding] ? NSOnState : NSOffState;
CGFloat ratioLimit = [torrent ratioLimit];
NSUInteger idleLimit = [torrent idleLimitMinutes];
NSInteger checkRatio = torrent.ratioSetting, checkIdle = torrent.idleSetting,
removeWhenFinishSeeding = torrent.removeWhenFinishSeeding ? NSOnState : NSOffState;
CGFloat ratioLimit = torrent.ratioLimit;
NSUInteger idleLimit = torrent.idleLimitMinutes;
while ((torrent = [enumerator nextObject])
&& (checkRatio != INVALID || ratioLimit != INVALID || checkIdle != INVALID || idleLimit != INVALID))
{
if (checkRatio != INVALID && checkRatio != [torrent ratioSetting])
if (checkRatio != INVALID && checkRatio != torrent.ratioSetting)
checkRatio = INVALID;
if (ratioLimit != INVALID && ratioLimit != [torrent ratioLimit])
if (ratioLimit != INVALID && ratioLimit != torrent.ratioLimit)
ratioLimit = INVALID;
if (checkIdle != INVALID && checkIdle != [torrent idleSetting])
if (checkIdle != INVALID && checkIdle != torrent.idleSetting)
checkIdle = INVALID;
if (idleLimit != INVALID && idleLimit != [torrent idleLimitMinutes])
if (idleLimit != INVALID && idleLimit != torrent.idleLimitMinutes)
idleLimit = INVALID;
if (removeWhenFinishSeeding != NSMixedState && removeWhenFinishSeeding != ([torrent removeWhenFinishSeeding] ? NSOnState : NSOffState))
if (removeWhenFinishSeeding != NSMixedState && removeWhenFinishSeeding != (torrent.removeWhenFinishSeeding ? NSOnState : NSOffState))
removeWhenFinishSeeding = NSMixedState;
}
@ -184,15 +184,15 @@
else
index = -1;
[fRatioPopUp selectItemAtIndex: index];
[fRatioPopUp setEnabled: YES];
fRatioPopUp.enabled = YES;
[fRatioLimitField setHidden: checkRatio != TR_RATIOLIMIT_SINGLE];
fRatioLimitField.hidden = checkRatio != TR_RATIOLIMIT_SINGLE;
if (ratioLimit != INVALID)
[fRatioLimitField setFloatValue: ratioLimit];
fRatioLimitField.floatValue = ratioLimit;
else
[fRatioLimitField setStringValue: @""];
fRatioLimitField.stringValue = @"";
[fRatioLimitGlobalLabel setHidden: checkRatio != TR_RATIOLIMIT_GLOBAL];
fRatioLimitGlobalLabel.hidden = checkRatio != TR_RATIOLIMIT_GLOBAL;
//set idle view
if (checkIdle == TR_IDLELIMIT_SINGLE)
@ -204,30 +204,30 @@
else
index = -1;
[fIdlePopUp selectItemAtIndex: index];
[fIdlePopUp setEnabled: YES];
fIdlePopUp.enabled = YES;
[fIdleLimitField setHidden: checkIdle != TR_IDLELIMIT_SINGLE];
fIdleLimitField.hidden = checkIdle != TR_IDLELIMIT_SINGLE;
if (idleLimit != INVALID)
[fIdleLimitField setIntegerValue: idleLimit];
fIdleLimitField.integerValue = idleLimit;
else
[fIdleLimitField setStringValue: @""];
[fIdleLimitLabel setHidden: checkIdle != TR_IDLELIMIT_SINGLE];
fIdleLimitField.stringValue = @"";
fIdleLimitLabel.hidden = checkIdle != TR_IDLELIMIT_SINGLE;
[fIdleLimitGlobalLabel setHidden: checkIdle != TR_IDLELIMIT_GLOBAL];
fIdleLimitGlobalLabel.hidden = checkIdle != TR_IDLELIMIT_GLOBAL;
//set remove transfer when seeding finishes
[fRemoveSeedingCompleteCheck setState: removeWhenFinishSeeding];
[fRemoveSeedingCompleteCheck setEnabled: YES];
fRemoveSeedingCompleteCheck.state = removeWhenFinishSeeding;
fRemoveSeedingCompleteCheck.enabled = YES;
//get priority info
enumerator = [fTorrents objectEnumerator];
torrent = [enumerator nextObject]; //first torrent
NSInteger priority = [torrent priority];
NSInteger priority = torrent.priority;
while ((torrent = [enumerator nextObject]) && priority != INVALID)
{
if (priority != INVALID && priority != [torrent priority])
if (priority != INVALID && priority != torrent.priority)
priority = INVALID;
}
@ -241,17 +241,17 @@
else
index = -1;
[fPriorityPopUp selectItemAtIndex: index];
[fPriorityPopUp setEnabled: YES];
fPriorityPopUp.enabled = YES;
//get peer info
enumerator = [fTorrents objectEnumerator];
torrent = [enumerator nextObject]; //first torrent
NSInteger maxPeers = [torrent maxPeerConnect];
NSInteger maxPeers = torrent.maxPeerConnect;
while ((torrent = [enumerator nextObject]))
{
if (maxPeers != [torrent maxPeerConnect])
if (maxPeers != torrent.maxPeerConnect)
{
maxPeers = INVALID;
break;
@ -259,49 +259,49 @@
}
//set peer view
[fPeersConnectField setEnabled: YES];
[fPeersConnectLabel setEnabled: YES];
fPeersConnectField.enabled = YES;
fPeersConnectLabel.enabled = YES;
if (maxPeers != INVALID)
[fPeersConnectField setIntValue: maxPeers];
fPeersConnectField.intValue = maxPeers;
else
[fPeersConnectField setStringValue: @""];
fPeersConnectField.stringValue = @"";
}
- (void) setUseSpeedLimit: (id) sender
{
const BOOL upload = sender == fUploadLimitCheck;
if ([(NSButton *)sender state] == NSMixedState)
if (((NSButton *)sender).state == NSMixedState)
[sender setState: NSOnState];
const BOOL limit = [(NSButton *)sender state] == NSOnState;
const BOOL limit = ((NSButton *)sender).state == NSOnState;
for (Torrent * torrent in fTorrents)
[torrent setUseSpeedLimit: limit upload: upload];
NSTextField * field = upload ? fUploadLimitField : fDownloadLimitField;
[field setEnabled: limit];
field.enabled = limit;
if (limit)
{
[field selectText: self];
[[[self view] window] makeKeyAndOrderFront: self];
[self.view.window makeKeyAndOrderFront: self];
}
NSTextField * label = upload ? fUploadLimitLabel : fDownloadLimitLabel;
[label setEnabled: limit];
label.enabled = limit;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptionsNotification" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptionsNotification" object: self];
}
- (void) setUseGlobalSpeedLimit: (id) sender
{
if ([(NSButton *)sender state] == NSMixedState)
if (((NSButton *)sender).state == NSMixedState)
[sender setState: NSOnState];
const BOOL limit = [(NSButton *)sender state] == NSOnState;
const BOOL limit = ((NSButton *)sender).state == NSOnState;
for (Torrent * torrent in fTorrents)
[torrent setUseGlobalSpeedLimit: limit];
torrent.usesGlobalSpeedLimit = limit;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptionsNotification" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptionsNotification" object: self];
}
- (void) setSpeedLimit: (id) sender
@ -312,7 +312,7 @@
for (Torrent * torrent in fTorrents)
[torrent setSpeedLimit: limit upload: upload];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptionsNotification" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptionsNotification" object: self];
}
- (void) setRatioSetting: (id) sender
@ -337,18 +337,18 @@
}
for (Torrent * torrent in fTorrents)
[torrent setRatioSetting: setting];
torrent.ratioSetting = setting;
[fRatioLimitField setHidden: !single];
fRatioLimitField.hidden = !single;
if (single)
{
[fRatioLimitField selectText: self];
[[[self view] window] makeKeyAndOrderFront: self];
[self.view.window makeKeyAndOrderFront: self];
}
[fRatioLimitGlobalLabel setHidden: setting != TR_RATIOLIMIT_GLOBAL];
fRatioLimitGlobalLabel.hidden = setting != TR_RATIOLIMIT_GLOBAL;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptionsNotification" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptionsNotification" object: self];
}
- (void) setRatioLimit: (id) sender
@ -356,9 +356,9 @@
const CGFloat limit = [sender floatValue];
for (Torrent * torrent in fTorrents)
[torrent setRatioLimit: limit];
torrent.ratioLimit = limit;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptionsNotification" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptionsNotification" object: self];
}
- (void) setIdleSetting: (id) sender
@ -383,19 +383,19 @@
}
for (Torrent * torrent in fTorrents)
[torrent setIdleSetting: setting];
torrent.idleSetting = setting;
[fIdleLimitField setHidden: !single];
[fIdleLimitLabel setHidden: !single];
fIdleLimitField.hidden = !single;
fIdleLimitLabel.hidden = !single;
if (single)
{
[fIdleLimitField selectText: self];
[[[self view] window] makeKeyAndOrderFront: self];
[self.view.window makeKeyAndOrderFront: self];
}
[fIdleLimitGlobalLabel setHidden: setting != TR_IDLELIMIT_GLOBAL];
fIdleLimitGlobalLabel.hidden = setting != TR_IDLELIMIT_GLOBAL;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptionsNotification" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptionsNotification" object: self];
}
- (void) setIdleLimit: (id) sender
@ -403,21 +403,21 @@
const NSUInteger limit = [sender integerValue];
for (Torrent * torrent in fTorrents)
[torrent setIdleLimitMinutes: limit];
torrent.idleLimitMinutes = limit;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptionsNotification" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptionsNotification" object: self];
}
- (IBAction) setRemoveWhenSeedingCompletes: (id) sender
{
if ([(NSButton *)sender state] == NSMixedState)
if (((NSButton *)sender).state == NSMixedState)
[sender setState: NSOnState];
const BOOL enable = [(NSButton *)sender state] == NSOnState;
const BOOL enable = ((NSButton *)sender).state == NSOnState;
for (Torrent * torrent in fTorrents)
[torrent setRemoveWhenFinishSeeding: enable];
torrent.removeWhenFinishSeeding = enable;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptionsNotification" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptionsNotification" object: self];
}
- (void) setPriority: (id) sender
@ -440,11 +440,11 @@
}
for (Torrent * torrent in fTorrents)
[torrent setPriority: priority];
torrent.priority = priority;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateUI" object: nil];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptionsNotification" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptionsNotification" object: self];
}
- (void) setPeersConnectLimit: (id) sender
@ -452,14 +452,14 @@
NSInteger limit = [sender intValue];
for (Torrent * torrent in fTorrents)
[torrent setMaxPeerConnect: limit];
torrent.maxPeerConnect = limit;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptionsNotification" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptionsNotification" object: self];
}
- (BOOL) control: (NSControl *) control textShouldBeginEditing: (NSText *) fieldEditor
{
fInitialString = [control stringValue];
fInitialString = control.stringValue;
return YES;
}
@ -469,7 +469,7 @@
NSBeep();
if (fInitialString)
{
[control setStringValue: fInitialString];
control.stringValue = fInitialString;
fInitialString = nil;
}
return NO;
@ -481,45 +481,45 @@
- (void) setupInfo
{
if ([fTorrents count] == 0)
if (fTorrents.count == 0)
{
[fUploadLimitCheck setEnabled: NO];
[fUploadLimitCheck setState: NSOffState];
[fUploadLimitField setEnabled: NO];
[fUploadLimitLabel setEnabled: NO];
[fUploadLimitField setStringValue: @""];
fUploadLimitCheck.enabled = NO;
fUploadLimitCheck.state = NSOffState;
fUploadLimitField.enabled = NO;
fUploadLimitLabel.enabled = NO;
fUploadLimitField.stringValue = @"";
[fDownloadLimitCheck setEnabled: NO];
[fDownloadLimitCheck setState: NSOffState];
[fDownloadLimitField setEnabled: NO];
[fDownloadLimitLabel setEnabled: NO];
[fDownloadLimitField setStringValue: @""];
fDownloadLimitCheck.enabled = NO;
fDownloadLimitCheck.state = NSOffState;
fDownloadLimitField.enabled = NO;
fDownloadLimitLabel.enabled = NO;
fDownloadLimitField.stringValue = @"";
[fGlobalLimitCheck setEnabled: NO];
[fGlobalLimitCheck setState: NSOffState];
fGlobalLimitCheck.enabled = NO;
fGlobalLimitCheck.state = NSOffState;
[fPriorityPopUp setEnabled: NO];
fPriorityPopUp.enabled = NO;
[fPriorityPopUp selectItemAtIndex: -1];
[fRatioPopUp setEnabled: NO];
fRatioPopUp.enabled = NO;
[fRatioPopUp selectItemAtIndex: -1];
[fRatioLimitField setHidden: YES];
[fRatioLimitField setStringValue: @""];
[fRatioLimitGlobalLabel setHidden: YES];
fRatioLimitField.hidden = YES;
fRatioLimitField.stringValue = @"";
fRatioLimitGlobalLabel.hidden = YES;
[fIdlePopUp setEnabled: NO];
fIdlePopUp.enabled = NO;
[fIdlePopUp selectItemAtIndex: -1];
[fIdleLimitField setHidden: YES];
[fIdleLimitField setStringValue: @""];
[fIdleLimitLabel setHidden: YES];
[fIdleLimitGlobalLabel setHidden: YES];
fIdleLimitField.hidden = YES;
fIdleLimitField.stringValue = @"";
fIdleLimitLabel.hidden = YES;
fIdleLimitGlobalLabel.hidden = YES;
[fRemoveSeedingCompleteCheck setEnabled: NO];
[fRemoveSeedingCompleteCheck setState: NSOffState];
fRemoveSeedingCompleteCheck.enabled = NO;
fRemoveSeedingCompleteCheck.state = NSOffState;
[fPeersConnectField setEnabled: NO];
[fPeersConnectField setStringValue: @""];
[fPeersConnectLabel setEnabled: NO];
fPeersConnectField.enabled = NO;
fPeersConnectField.stringValue = @"";
fPeersConnectLabel.enabled = NO;
}
else
[self updateOptions];
@ -527,27 +527,27 @@
- (void) setGlobalLabels
{
NSString * global = [[NSUserDefaults standardUserDefaults] boolForKey: @"RatioCheck"]
? [NSString stringForRatio: [[NSUserDefaults standardUserDefaults] floatForKey: @"RatioLimit"]]
NSString * global = [NSUserDefaults.standardUserDefaults boolForKey: @"RatioCheck"]
? [NSString stringForRatio: [NSUserDefaults.standardUserDefaults floatForKey: @"RatioLimit"]]
: NSLocalizedString(@"disabled", "Info options -> global setting");
[fRatioLimitGlobalLabel setStringValue: global];
fRatioLimitGlobalLabel.stringValue = global;
//idle field
NSString * globalIdle;
if ([[NSUserDefaults standardUserDefaults] boolForKey: @"IdleLimitCheck"])
if ([NSUserDefaults.standardUserDefaults boolForKey: @"IdleLimitCheck"])
{
const NSInteger globalMin = [[NSUserDefaults standardUserDefaults] integerForKey: @"IdleLimitMinutes"];
const NSInteger globalMin = [NSUserDefaults.standardUserDefaults integerForKey: @"IdleLimitMinutes"];
globalIdle = globalMin == 1 ? NSLocalizedString(@"1 minute", "Info options -> global setting")
: [NSString localizedStringWithFormat: NSLocalizedString(@"%d minutes", "Info options -> global setting"), globalMin];
}
else
globalIdle = NSLocalizedString(@"disabled", "Info options -> global setting");
[fIdleLimitGlobalLabel setStringValue: globalIdle];
fIdleLimitGlobalLabel.stringValue = globalIdle;
}
- (void) updateOptionsNotification: (NSNotification *) notification
{
if ([notification object] != self)
if (notification.object != self)
[self updateOptions];
}

2
macosx/InfoPeersViewController.h
View File

@ -26,7 +26,7 @@
@class WebSeedTableView;
@interface InfoPeersViewController : NSViewController <InfoViewController, NSAnimationDelegate>
@interface InfoPeersViewController : NSViewController <InfoViewController>
{
NSArray * fTorrents;

162
macosx/InfoPeersViewController.m
View File

@ -33,22 +33,22 @@
#define ANIMATION_ID_KEY @"animationId"
#define WEB_SEED_ANIMATION_ID @"webSeed"
@interface InfoPeersViewController (Private)
@interface InfoPeersViewController (Private) <CAAnimationDelegate>
- (void) setupInfo;
- (void) setWebSeedTableHidden: (BOOL) hide animate: (BOOL) animate;
- (NSArray *) peerSortDescriptors;
@property (nonatomic, readonly) NSArray *peerSortDescriptors;
@end
@implementation InfoPeersViewController
- (id) init
- (instancetype) init
{
if ((self = [super initWithNibName: @"InfoPeersView" bundle: nil]))
{
[self setTitle: NSLocalizedString(@"Peers", "Inspector view -> title")];
self.title = NSLocalizedString(@"Peers", "Inspector view -> title");
}
return self;
@ -56,51 +56,51 @@
- (void) awakeFromNib
{
const CGFloat height = [[NSUserDefaults standardUserDefaults] floatForKey: @"InspectorContentHeightPeers"];
const CGFloat height = [NSUserDefaults.standardUserDefaults floatForKey: @"InspectorContentHeightPeers"];
if (height != 0.0)
{
NSRect viewRect = [[self view] frame];
NSRect viewRect = self.view.frame;
viewRect.size.height = height;
[[self view] setFrame: viewRect];
self.view.frame = viewRect;
}
//set table header text
[[[fPeerTable tableColumnWithIdentifier: @"IP"] headerCell] setStringValue: NSLocalizedString(@"IP Address",
"inspector -> peer table -> header")];
[[[fPeerTable tableColumnWithIdentifier: @"Client"] headerCell] setStringValue: NSLocalizedString(@"Client",
"inspector -> peer table -> header")];
[[[fPeerTable tableColumnWithIdentifier: @"DL From"] headerCell] setStringValue: NSLocalizedString(@"DL",
"inspector -> peer table -> header")];
[[[fPeerTable tableColumnWithIdentifier: @"UL To"] headerCell] setStringValue: NSLocalizedString(@"UL",
"inspector -> peer table -> header")];
[fPeerTable tableColumnWithIdentifier: @"IP"].headerCell.stringValue = NSLocalizedString(@"IP Address",
"inspector -> peer table -> header");
[fPeerTable tableColumnWithIdentifier: @"Client"].headerCell.stringValue = NSLocalizedString(@"Client",
"inspector -> peer table -> header");
[fPeerTable tableColumnWithIdentifier: @"DL From"].headerCell.stringValue = NSLocalizedString(@"DL",
"inspector -> peer table -> header");
[fPeerTable tableColumnWithIdentifier: @"UL To"].headerCell.stringValue = NSLocalizedString(@"UL",
"inspector -> peer table -> header");
[[[fWebSeedTable tableColumnWithIdentifier: @"Address"] headerCell] setStringValue: NSLocalizedString(@"Web Seeds",
"inspector -> web seed table -> header")];
[[[fWebSeedTable tableColumnWithIdentifier: @"DL From"] headerCell] setStringValue: NSLocalizedString(@"DL",
"inspector -> web seed table -> header")];
[fWebSeedTable tableColumnWithIdentifier: @"Address"].headerCell.stringValue = NSLocalizedString(@"Web Seeds",
"inspector -> web seed table -> header");
[fWebSeedTable tableColumnWithIdentifier: @"DL From"].headerCell.stringValue = NSLocalizedString(@"DL",
"inspector -> web seed table -> header");
//set table header tool tips
[[fPeerTable tableColumnWithIdentifier: @"Encryption"] setHeaderToolTip: NSLocalizedString(@"Encrypted Connection",
"inspector -> peer table -> header tool tip")];
[[fPeerTable tableColumnWithIdentifier: @"Progress"] setHeaderToolTip: NSLocalizedString(@"Available",
"inspector -> peer table -> header tool tip")];
[[fPeerTable tableColumnWithIdentifier: @"DL From"] setHeaderToolTip: NSLocalizedString(@"Downloading From Peer",
"inspector -> peer table -> header tool tip")];
[[fPeerTable tableColumnWithIdentifier: @"UL To"] setHeaderToolTip: NSLocalizedString(@"Uploading To Peer",
"inspector -> peer table -> header tool tip")];
[fPeerTable tableColumnWithIdentifier: @"Encryption"].headerToolTip = NSLocalizedString(@"Encrypted Connection",
"inspector -> peer table -> header tool tip");
[fPeerTable tableColumnWithIdentifier: @"Progress"].headerToolTip = NSLocalizedString(@"Available",
"inspector -> peer table -> header tool tip");
[fPeerTable tableColumnWithIdentifier: @"DL From"].headerToolTip = NSLocalizedString(@"Downloading From Peer",
"inspector -> peer table -> header tool tip");
[fPeerTable tableColumnWithIdentifier: @"UL To"].headerToolTip = NSLocalizedString(@"Uploading To Peer",
"inspector -> peer table -> header tool tip");
[[fWebSeedTable tableColumnWithIdentifier: @"DL From"] setHeaderToolTip: NSLocalizedString(@"Downloading From Web Seed",
"inspector -> web seed table -> header tool tip")];
[fWebSeedTable tableColumnWithIdentifier: @"DL From"].headerToolTip = NSLocalizedString(@"Downloading From Web Seed",
"inspector -> web seed table -> header tool tip");
//prepare for animating peer table and web seed table
fViewTopMargin = fWebSeedTableTopConstraint.constant;
CABasicAnimation * webSeedTableAnimation = [CABasicAnimation animation];
[webSeedTableAnimation setTimingFunction: [CAMediaTimingFunction functionWithName: kCAMediaTimingFunctionLinear]];
[webSeedTableAnimation setDuration: 0.125];
[webSeedTableAnimation setDelegate: self];
webSeedTableAnimation.timingFunction = [CAMediaTimingFunction functionWithName: kCAMediaTimingFunctionLinear];
webSeedTableAnimation.duration = 0.125;
webSeedTableAnimation.delegate = self;
[webSeedTableAnimation setValue: WEB_SEED_ANIMATION_ID forKey: ANIMATION_ID_KEY];
[fWebSeedTableTopConstraint setAnimations: @{ @"constant": webSeedTableAnimation }];
fWebSeedTableTopConstraint.animations = @{ @"constant": webSeedTableAnimation };
[self setWebSeedTableHidden: YES animate: NO];
}
@ -120,7 +120,7 @@
if (!fSet)
[self setupInfo];
if ([fTorrents count] == 0)
if (fTorrents.count == 0)
return;
if (!fPeers)
@ -138,36 +138,36 @@
BOOL anyActive = false;
for (Torrent * torrent in fTorrents)
{
if ([torrent webSeedCount] > 0)
[fWebSeeds addObjectsFromArray: [torrent webSeeds]];
if (torrent.webSeedCount > 0)
[fWebSeeds addObjectsFromArray: torrent.webSeeds];
if ([torrent isActive])
if (torrent.active)
{
anyActive = YES;
[fPeers addObjectsFromArray: [torrent peers]];
[fPeers addObjectsFromArray: torrent.peers];
const NSUInteger connectedThis = [torrent totalPeersConnected];
const NSUInteger connectedThis = torrent.totalPeersConnected;
if (connectedThis > 0)
{
connected += [torrent totalPeersConnected];
tracker += [torrent totalPeersTracker];
incoming += [torrent totalPeersIncoming];
cache += [torrent totalPeersCache];
lpd += [torrent totalPeersLocal];
pex += [torrent totalPeersPex];
dht += [torrent totalPeersDHT];
ltep += [torrent totalPeersLTEP];
connected += torrent.totalPeersConnected;
tracker += torrent.totalPeersTracker;
incoming += torrent.totalPeersIncoming;
cache += torrent.totalPeersCache;
lpd += torrent.totalPeersLocal;
pex += torrent.totalPeersPex;
dht += torrent.totalPeersDHT;
ltep += torrent.totalPeersLTEP;
toUs += [torrent peersSendingToUs];
fromUs += [torrent peersGettingFromUs];
toUs += torrent.peersSendingToUs;
fromUs += torrent.peersGettingFromUs;
}
}
}
[fPeers sortUsingDescriptors: [self peerSortDescriptors]];
[fPeers sortUsingDescriptors: self.peerSortDescriptors];
[fPeerTable reloadData];
[fWebSeeds sortUsingDescriptors: [fWebSeedTable sortDescriptors]];
[fWebSeeds sortUsingDescriptors: fWebSeedTable.sortDescriptors];
[fWebSeedTable reloadData];
[fWebSeedTable setWebSeeds: fWebSeeds];
@ -185,7 +185,7 @@
if (fromUs > 0)
[upDownComponents addObject: [NSString stringWithFormat:
NSLocalizedString(@"UL to %d", "Inspector -> Peers tab -> peers"), fromUs]];
if ([upDownComponents count] > 0)
if (upDownComponents.count > 0)
connectedText = [connectedText stringByAppendingFormat: @": %@", [upDownComponents componentsJoinedByString: @", "]];
NSMutableArray * fromComponents = [NSMutableArray arrayWithCapacity: 7];
@ -214,23 +214,23 @@
connectedText = [connectedText stringByAppendingFormat: @"\n%@", [fromComponents componentsJoinedByString: @", "]];
}
[fConnectedPeersField setStringValue: connectedText];
fConnectedPeersField.stringValue = connectedText;
}
else
{
NSString * notActiveString;
if ([fTorrents count] == 1)
if (fTorrents.count == 1)
notActiveString = NSLocalizedString(@"Transfer Not Active", "Inspector -> Peers tab -> peers");
else
notActiveString = NSLocalizedString(@"Transfers Not Active", "Inspector -> Peers tab -> peers");
[fConnectedPeersField setStringValue: notActiveString];
fConnectedPeersField.stringValue = notActiveString;
}
}
- (void) saveViewSize
{
[[NSUserDefaults standardUserDefaults] setFloat: NSHeight([[self view] frame]) forKey: @"InspectorContentHeightPeers"];
[NSUserDefaults.standardUserDefaults setFloat: NSHeight(self.view.frame) forKey: @"InspectorContentHeightPeers"];
}
- (void) clearView
@ -242,29 +242,29 @@
- (NSInteger) numberOfRowsInTableView: (NSTableView *) tableView
{
if (tableView == fWebSeedTable)
return fWebSeeds ? [fWebSeeds count] : 0;
return fWebSeeds ? fWebSeeds.count : 0;
else
return fPeers ? [fPeers count] : 0;
return fPeers ? fPeers.count : 0;
}
- (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) column row: (NSInteger) row
{
if (tableView == fWebSeedTable)
{
NSString * ident = [column identifier];
NSString * ident = column.identifier;
NSDictionary * webSeed = fWebSeeds[row];
if ([ident isEqualToString: @"DL From"])
{
NSNumber * rate;
return (rate = webSeed[@"DL From Rate"]) ? [NSString stringForSpeedAbbrev: [rate doubleValue]] : @"";
return (rate = webSeed[@"DL From Rate"]) ? [NSString stringForSpeedAbbrev: rate.doubleValue] : @"";
}
else
return webSeed[@"Address"];
}
else
{
NSString * ident = [column identifier];
NSString * ident = column.identifier;
NSDictionary * peer = fPeers[row];
if ([ident isEqualToString: @"Encryption"])
@ -276,12 +276,12 @@
else if ([ident isEqualToString: @"UL To"])
{
NSNumber * rate;
return (rate = peer[@"UL To Rate"]) ? [NSString stringForSpeedAbbrev: [rate doubleValue]] : @"";
return (rate = peer[@"UL To Rate"]) ? [NSString stringForSpeedAbbrev: rate.doubleValue] : @"";
}
else if ([ident isEqualToString: @"DL From"])
{
NSNumber * rate;
return (rate = peer[@"DL From Rate"]) ? [NSString stringForSpeedAbbrev: [rate doubleValue]] : @"";
return (rate = peer[@"DL From Rate"]) ? [NSString stringForSpeedAbbrev: rate.doubleValue] : @"";
}
else
return peer[@"IP"];
@ -293,7 +293,7 @@
{
if (tableView == fPeerTable)
{
NSString * ident = [tableColumn identifier];
NSString * ident = tableColumn.identifier;
if ([ident isEqualToString: @"Progress"])
{
@ -309,7 +309,7 @@
{
if (fWebSeeds)
{
[fWebSeeds sortUsingDescriptors: [fWebSeedTable sortDescriptors]];
[fWebSeeds sortUsingDescriptors: fWebSeedTable.sortDescriptors];
[tableView reloadData];
}
}
@ -317,7 +317,7 @@
{
if (fPeers)
{
[fPeers sortUsingDescriptors: [self peerSortDescriptors]];
[fPeers sortUsingDescriptors: self.peerSortDescriptors];
[tableView reloadData];
}
}
@ -333,7 +333,7 @@
{
if (tableView == fPeerTable)
{
const BOOL multiple = [fTorrents count] > 1;
const BOOL multiple = fTorrents.count > 1;
NSDictionary * peer = fPeers[row];
NSMutableArray * components = [NSMutableArray arrayWithCapacity: multiple ? 6 : 5];
@ -419,7 +419,7 @@
[statusArray addObject: NSLocalizedString(@"You unchoked the peer, but the peer is not interested",
"Inspector -> peer -> status")];
if ([statusArray count] > 0)
if (statusArray.count > 0)
{
NSString * statusStrings = [statusArray componentsJoinedByString: @"\n\n"];
[components addObject: [@"\n" stringByAppendingString: statusStrings]];
@ -429,7 +429,7 @@
}
else
{
if ([fTorrents count] > 1)
if (fTorrents.count > 1)
return fWebSeeds[row][@"Name"];
}
@ -441,7 +441,7 @@
if (![[animation valueForKey: ANIMATION_ID_KEY] isEqualToString: WEB_SEED_ANIMATION_ID])
return;
[[fWebSeedTable enclosingScrollView] setHidden: NO];
fWebSeedTable.enclosingScrollView.hidden = NO;
}
- (void) animationDidStop: (CAAnimation *) animation finished: (BOOL) finished
@ -449,7 +449,7 @@
if (![[animation valueForKey: ANIMATION_ID_KEY] isEqualToString: WEB_SEED_ANIMATION_ID])
return;
[[fWebSeedTable enclosingScrollView] setHidden: finished && fWebSeedTableTopConstraint.constant < 0];
fWebSeedTable.enclosingScrollView.hidden = finished && fWebSeedTableTopConstraint.constant < 0;
}
@end
@ -460,17 +460,17 @@
{
__block BOOL hasWebSeeds = NO;
if ([fTorrents count] == 0)
if (fTorrents.count == 0)
{
fPeers = nil;
[fPeerTable reloadData];
[fConnectedPeersField setStringValue: @""];
fConnectedPeersField.stringValue = @"";
}
else
{
[fTorrents enumerateObjectsWithOptions: NSEnumerationConcurrent usingBlock: ^(Torrent * torrent, NSUInteger idx, BOOL *stop) {
if ([torrent webSeedCount] > 0)
if (torrent.webSeedCount > 0)
{
hasWebSeeds = YES;
*stop = YES;
@ -492,27 +492,27 @@
- (void) setWebSeedTableHidden: (BOOL) hide animate: (BOOL) animate
{
if (animate && (![[self view] window] || ![[[self view] window] isVisible]))
if (animate && (!self.view.window || !self.view.window.visible))
animate = NO;
const CGFloat webSeedTableTopMargin = hide ? -NSHeight([[fWebSeedTable enclosingScrollView] frame]) : fViewTopMargin;
const CGFloat webSeedTableTopMargin = hide ? -NSHeight(fWebSeedTable.enclosingScrollView.frame) : fViewTopMargin;
[(animate ? [fWebSeedTableTopConstraint animator] : fWebSeedTableTopConstraint) setConstant: webSeedTableTopMargin];
(animate ? [fWebSeedTableTopConstraint animator] : fWebSeedTableTopConstraint).constant = webSeedTableTopMargin;
}
- (NSArray *) peerSortDescriptors
{
NSMutableArray * descriptors = [NSMutableArray arrayWithCapacity: 2];
NSArray * oldDescriptors = [fPeerTable sortDescriptors];
NSArray * oldDescriptors = fPeerTable.sortDescriptors;
BOOL useSecond = YES, asc = YES;
if ([oldDescriptors count] > 0)
if (oldDescriptors.count > 0)
{
NSSortDescriptor * descriptor = oldDescriptors[0];
[descriptors addObject: descriptor];
if ((useSecond = ![[descriptor key] isEqualToString: @"IP"]))
asc = [descriptor ascending];
if ((useSecond = ![descriptor.key isEqualToString: @"IP"]))
asc = descriptor.ascending;
}
//sort by IP after primary sort

13
macosx/InfoTabButtonBack.m
View File

@ -25,21 +25,20 @@
@implementation InfoTabButtonBack
- (void) drawRect: (NSRect) rect
{
NSInteger count = 0;
NSRect gridRects[2];
NSColor * colorRects[2];
NSRect lineBorderRect = NSMakeRect(NSMinX(rect), NSHeight([self bounds]) - 1.0, NSWidth(rect), 1.0);
NSRect lineBorderRect = NSMakeRect(NSMinX(rect), NSHeight(self.bounds) - 1.0, NSWidth(rect), 1.0);
if (NSIntersectsRect(lineBorderRect, rect))
{
gridRects[count] = lineBorderRect;
if (@available(macOS 10.14, *)) {
colorRects[count] = [NSColor separatorColor];
colorRects[count] = NSColor.separatorColor;
} else {
colorRects[count] = [NSColor grayColor];
colorRects[count] = NSColor.grayColor;
}
++count;
@ -51,9 +50,9 @@
{
gridRects[count] = lineBorderRect;
if (@available(macOS 10.14, *)) {
colorRects[count] = [NSColor separatorColor];
colorRects[count] = NSColor.separatorColor;
} else {
colorRects[count] = [NSColor grayColor];
colorRects[count] = NSColor.grayColor;
}
++count;
@ -65,7 +64,7 @@
NSGradient *gradient;
if ([NSApp isDarkMode]) {
if (NSApp.isDarkMode) {
NSColor * darkColor = [NSColor colorWithCalibratedRed: 60.0/255.0 green: 60.0/255.0 blue: 60.0/255.0 alpha: 1.0];
NSColor * lightColor = [NSColor colorWithCalibratedRed: 90.0/255.0 green: 90.0/255.0 blue: 90.0/255.0 alpha: 1.0];
gradient = [[NSGradient alloc] initWithStartingColor: lightColor endingColor: darkColor];

40
macosx/InfoTabButtonCell.m
View File

@ -27,8 +27,8 @@
- (void) awakeFromNib
{
if (![NSApp isOnMojaveOrBetter]) {
NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
if (!NSApp.onMojaveOrBetter) {
NSNotificationCenter * nc = NSNotificationCenter.defaultCenter;
[nc addObserver: self selector: @selector(updateControlTint:)
name: NSControlTintDidChangeNotification object: NSApp];
}
@ -36,23 +36,23 @@
fSelected = NO;
//expects the icon to currently be set as the image
fIcon = [self image];
fIcon = self.image;
}
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[NSNotificationCenter.defaultCenter removeObserver: self];
}
- (void) setControlView: (NSView *) controlView
{
const BOOL hadControlView = [self controlView] != nil;
const BOOL hadControlView = self.controlView != nil;
[super setControlView: controlView];
super.controlView = controlView;
if (!hadControlView)
{
[(NSMatrix *)[self controlView] setToolTip: [self title] forCell: self];
[(NSMatrix *)self.controlView setToolTip: self.title forCell: self];
[self setSelectedTab: fSelected];
}
}
@ -66,12 +66,12 @@
- (void) reloadAppearance
{
if ([self controlView] == nil)
if (self.controlView == nil)
return;
NSInteger row, col;
[(NSMatrix *)[self controlView] getRow: &row column: &col ofCell: self];
NSRect tabRect = [(NSMatrix *)[self controlView] cellFrameAtRow: row column: col];
[(NSMatrix *)self.controlView getRow: &row column: &col ofCell: self];
NSRect tabRect = [(NSMatrix *)self.controlView cellFrameAtRow: row column: col];
tabRect.origin.x = 0.0;
tabRect.origin.y = 0.0;
@ -84,17 +84,17 @@
{
NSColor * lightColor, * darkColor;
if (@available(macOS 10.14, *)) {
lightColor = [NSColor.controlAccentColor blendedColorWithFraction: 0.35 ofColor: [NSColor whiteColor]];
darkColor = [NSColor.controlAccentColor blendedColorWithFraction: 0.15 ofColor: [NSColor whiteColor]];
lightColor = [NSColor.controlAccentColor blendedColorWithFraction: 0.35 ofColor: NSColor.whiteColor];
darkColor = [NSColor.controlAccentColor blendedColorWithFraction: 0.15 ofColor: NSColor.whiteColor];
} else {
lightColor = [NSColor colorForControlTint: [NSColor currentControlTint]];
darkColor = [lightColor blendedColorWithFraction: 0.2 ofColor: [NSColor blackColor]];
lightColor = [NSColor colorForControlTint: NSColor.currentControlTint];
darkColor = [lightColor blendedColorWithFraction: 0.2 ofColor: NSColor.blackColor];
}
gradient = [[NSGradient alloc] initWithStartingColor: lightColor endingColor: darkColor];
}
else
{
if ([NSApp isDarkMode]) {
if (NSApp.isDarkMode) {
NSColor * darkColor = [NSColor colorWithCalibratedRed: 60.0/255.0 green: 60.0/255.0 blue: 60.0/255.0 alpha: 1.0];
NSColor * lightColor = [NSColor colorWithCalibratedRed: 90.0/255.0 green: 90.0/255.0 blue: 90.0/255.0 alpha: 1.0];
gradient = [[NSGradient alloc] initWithStartingColor: lightColor endingColor: darkColor];
@ -106,9 +106,9 @@
}
if (@available(macOS 10.14, *)) {
[[NSColor separatorColor] set];
[NSColor.separatorColor set];
} else {
[[NSColor grayColor] set];
[NSColor.grayColor set];
}
NSRectFill(NSMakeRect(0.0, 0.0, NSWidth(tabRect), 1.0));
NSRectFill(NSMakeRect(0.0, NSHeight(tabRect) - 1.0, NSWidth(tabRect), 1.0));
@ -120,7 +120,7 @@
if (fIcon)
{
const NSSize iconSize = [fIcon size];
const NSSize iconSize = fIcon.size;
const NSRect iconRect = NSMakeRect(NSMinX(tabRect) + floor((NSWidth(tabRect) - iconSize.width) * 0.5),
NSMinY(tabRect) + floor((NSHeight(tabRect) - iconSize.height) * 0.5),
@ -131,12 +131,12 @@
[tabImage unlockFocus];
[self setImage: tabImage];
self.image = tabImage;
}
- (void) updateControlTint: (NSNotification *) notification
{
NSAssert(![NSApp isOnMojaveOrBetter], @"should not be observing control tint color when accent color is available");
NSAssert(!NSApp.onMojaveOrBetter, @"should not be observing control tint color when accent color is available");
if (fSelected)
[self setSelectedTab: YES];

8
macosx/InfoTextField.m
View File

@ -26,16 +26,16 @@
- (void) setStringValue: (NSString *) string
{
[super setStringValue: string];
super.stringValue = string;
[self setSelectable: ![[self stringValue] isEqualToString: @""]];
self.selectable = ![self.stringValue isEqualToString: @""];
}
- (void) setObjectValue: (id <NSCopying>) object
{
[super setObjectValue: object];
super.objectValue = object;
[self setSelectable: ![[self stringValue] isEqualToString: @""]];
self.selectable = ![self.stringValue isEqualToString: @""];
}
@end

107
macosx/InfoTrackersViewController.m
View File

@ -44,11 +44,11 @@
@implementation InfoTrackersViewController
- (id) init
- (instancetype) init
{
if ((self = [super initWithNibName: @"InfoTrackersView" bundle: nil]))
{
[self setTitle: NSLocalizedString(@"Trackers", "Inspector view -> title")];
self.title = NSLocalizedString(@"Trackers", "Inspector view -> title");
fTrackerCell = [[TrackerCell alloc] init];
}
@ -58,17 +58,17 @@
- (void) awakeFromNib
{
[[fTrackerAddRemoveControl cell] setToolTip: NSLocalizedString(@"Add a tracker", "Inspector view -> tracker buttons")
[fTrackerAddRemoveControl.cell setToolTip: NSLocalizedString(@"Add a tracker", "Inspector view -> tracker buttons")
forSegment: TRACKER_ADD_TAG];
[[fTrackerAddRemoveControl cell] setToolTip: NSLocalizedString(@"Remove selected trackers", "Inspector view -> tracker buttons")
[fTrackerAddRemoveControl.cell setToolTip: NSLocalizedString(@"Remove selected trackers", "Inspector view -> tracker buttons")
forSegment: TRACKER_REMOVE_TAG];
const CGFloat height = [[NSUserDefaults standardUserDefaults] floatForKey: @"InspectorContentHeightTracker"];
const CGFloat height = [NSUserDefaults.standardUserDefaults floatForKey: @"InspectorContentHeightTracker"];
if (height != 0.0)
{
NSRect viewRect = [[self view] frame];
NSRect viewRect = self.view.frame;
viewRect.size.height = height;
[[self view] setFrame: viewRect];
self.view.frame = viewRect;
}
}
@ -86,52 +86,52 @@
if (!fSet)
[self setupInfo];
if ([fTorrents count] == 0)
if (fTorrents.count == 0)
return;
//get updated tracker stats
if ([fTrackerTable editedRow] == -1)
if (fTrackerTable.editedRow == -1)
{
NSArray * oldTrackers = fTrackers;
if ([fTorrents count] == 1)
fTrackers = [fTorrents[0] allTrackerStats];
if (fTorrents.count == 1)
fTrackers = ((Torrent *)fTorrents[0]).allTrackerStats;
else
{
fTrackers = [[NSMutableArray alloc] init];
for (Torrent * torrent in fTorrents)
[fTrackers addObjectsFromArray: [torrent allTrackerStats]];
[fTrackers addObjectsFromArray: torrent.allTrackerStats];
}
[fTrackerTable setTrackers: fTrackers];
if (oldTrackers && [fTrackers isEqualToArray: oldTrackers])
[fTrackerTable setNeedsDisplay: YES];
fTrackerTable.needsDisplay = YES;
else
[fTrackerTable reloadData];
}
else
{
NSAssert1([fTorrents count] == 1, @"Attempting to add tracker with %ld transfers selected", [fTorrents count]);
NSAssert1(fTorrents.count == 1, @"Attempting to add tracker with %ld transfers selected", fTorrents.count);
NSIndexSet * addedIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange([fTrackers count]-2, 2)];
NSIndexSet * addedIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(fTrackers.count-2, 2)];
NSArray * tierAndTrackerBeingAdded = [fTrackers objectsAtIndexes: addedIndexes];
fTrackers = [fTorrents[0] allTrackerStats];
fTrackers = ((Torrent *)fTorrents[0]).allTrackerStats;
[fTrackers addObjectsFromArray: tierAndTrackerBeingAdded];
[fTrackerTable setTrackers: fTrackers];
NSIndexSet * updateIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTrackers count]-2)],
* columnIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [[fTrackerTable tableColumns] count])];
NSIndexSet * updateIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, fTrackers.count-2)],
* columnIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, fTrackerTable.tableColumns.count)];
[fTrackerTable reloadDataForRowIndexes: updateIndexes columnIndexes: columnIndexes];
}
}
- (void) saveViewSize
{
[[NSUserDefaults standardUserDefaults] setFloat: NSHeight([[self view] frame]) forKey: @"InspectorContentHeightTracker"];
[NSUserDefaults.standardUserDefaults setFloat: NSHeight(self.view.frame) forKey: @"InspectorContentHeightTracker"];
}
- (void) clearView
@ -141,7 +141,7 @@
- (NSInteger) numberOfRowsInTableView: (NSTableView *) tableView
{
return fTrackers ? [fTrackers count] : 0;
return fTrackers ? fTrackers.count : 0;
}
- (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) column row: (NSInteger) row
@ -154,7 +154,7 @@
NSString * tierString = tier == -1 ? NSLocalizedString(@"New Tier", "Inspector -> tracker table")
: [NSString stringWithFormat: NSLocalizedString(@"Tier %d", "Inspector -> tracker table"), tier];
if ([fTorrents count] > 1)
if (fTorrents.count > 1)
tierString = [tierString stringByAppendingFormat: @" - %@", item[@"Name"]];
return tierString;
}
@ -174,7 +174,7 @@
if ([fTrackers[row] isKindOfClass: [NSDictionary class]])
return TRACKER_GROUP_SEPARATOR_HEIGHT;
else
return [tableView rowHeight];
return tableView.rowHeight;
}
- (BOOL) tableView: (NSTableView *) tableView shouldEditTableColumn: (NSTableColumn *) tableColumn row: (NSInteger) row
@ -185,12 +185,12 @@
- (void) tableViewSelectionDidChange: (NSNotification *) notification
{
[fTrackerAddRemoveControl setEnabled: [fTrackerTable numberOfSelectedRows] > 0 forSegment: TRACKER_REMOVE_TAG];
[fTrackerAddRemoveControl setEnabled: fTrackerTable.numberOfSelectedRows > 0 forSegment: TRACKER_REMOVE_TAG];
}
- (BOOL) tableView: (NSTableView *) tableView isGroupRow: (NSInteger) row
{
return ![fTrackers[row] isKindOfClass: [TrackerNode class]] && [tableView editedRow] != row;
return ![fTrackers[row] isKindOfClass: [TrackerNode class]] && tableView.editedRow != row;
}
- (NSString *) tableView: (NSTableView *) tableView toolTipForCell: (NSCell *) cell rect: (NSRectPointer) rect
@ -198,7 +198,7 @@
{
id node = fTrackers[row];
if ([node isKindOfClass: [TrackerNode class]])
return [(TrackerNode *)node fullAnnounceAddress];
return ((TrackerNode *)node).fullAnnounceAddress;
else
return nil;
}
@ -217,19 +217,19 @@
NSBeep();
//reset table with either new or old value
fTrackers = [torrent allTrackerStats];
fTrackers = torrent.allTrackerStats;
[fTrackerTable setTrackers: fTrackers];
[fTrackerTable reloadData];
[fTrackerTable deselectAll: self];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil]; //incase sort by tracker
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateUI" object: nil]; //incase sort by tracker
}
- (void) addRemoveTracker: (id) sender
{
//don't allow add/remove when currently adding - it leads to weird results
if ([fTrackerTable editedRow] != -1)
if (fTrackerTable.editedRow != -1)
return;
[self updateInfo];
@ -246,7 +246,7 @@
- (void) setupInfo
{
const NSUInteger numberSelected = [fTorrents count];
const NSUInteger numberSelected = fTorrents.count;
if (numberSelected != 1)
{
if (numberSelected == 0)
@ -278,36 +278,37 @@
#warning doesn't like blank addresses
- (void) addTrackers
{
[[[self view] window] makeKeyWindow];
[self.view.window makeKeyWindow];
NSAssert1([fTorrents count] == 1, @"Attempting to add tracker with %ld transfers selected", [fTorrents count]);
NSAssert1(fTorrents.count == 1, @"Attempting to add tracker with %ld transfers selected", fTorrents.count);
[fTrackers addObject: @{@"Tier": @-1}];
[fTrackers addObject: @""];
[fTrackerTable setTrackers: fTrackers];
[fTrackerTable reloadData];
[fTrackerTable selectRowIndexes: [NSIndexSet indexSetWithIndex: [fTrackers count]-1] byExtendingSelection: NO];
[fTrackerTable editColumn: [fTrackerTable columnWithIdentifier: @"Tracker"] row: [fTrackers count]-1 withEvent: nil select: YES];
[fTrackerTable selectRowIndexes: [NSIndexSet indexSetWithIndex: fTrackers.count-1] byExtendingSelection: NO];
[fTrackerTable editColumn: [fTrackerTable columnWithIdentifier: @"Tracker"] row: fTrackers.count-1 withEvent: nil select: YES];
}
- (void) removeTrackers
{
NSMutableDictionary * removeIdentifiers = [NSMutableDictionary dictionaryWithCapacity: [fTorrents count]];
NSMutableDictionary * removeIdentifiers = [NSMutableDictionary dictionaryWithCapacity: fTorrents.count];
NSUInteger removeTrackerCount = 0;
NSIndexSet * selectedIndexes = [fTrackerTable selectedRowIndexes];
NSIndexSet * selectedIndexes = fTrackerTable.selectedRowIndexes;
BOOL groupSelected = NO;
NSUInteger groupRowIndex = NSNotFound;
NSMutableIndexSet * removeIndexes = [NSMutableIndexSet indexSet];
for (NSUInteger i = 0; i < [fTrackers count]; ++i)
for (NSUInteger i = 0; i < fTrackers.count; ++i)
{
id object = fTrackers[i];
if ([object isKindOfClass: [TrackerNode class]])
{
TrackerNode * node = (TrackerNode *)object;
if (groupSelected || [selectedIndexes containsIndex: i])
{
Torrent * torrent = [(TrackerNode *)object torrent];
Torrent * torrent = node.torrent;
NSMutableSet * removeSet;
if (!(removeSet = removeIdentifiers[torrent]))
{
@ -315,7 +316,7 @@
removeIdentifiers[torrent] = removeSet;
}
[removeSet addObject: [(TrackerNode *)object fullAnnounceAddress]];
[removeSet addObject: node.fullAnnounceAddress];
++removeTrackerCount;
[removeIndexes addIndex: i];
@ -330,7 +331,7 @@
[removeIndexes addIndex: groupRowIndex];
groupSelected = [selectedIndexes containsIndex: i];
if (!groupSelected && i > [selectedIndexes lastIndex])
if (!groupSelected && i > selectedIndexes.lastIndex)
{
groupRowIndex = NSNotFound;
break;
@ -344,39 +345,39 @@
if (groupRowIndex != NSNotFound)
[removeIndexes addIndex: groupRowIndex];
NSAssert2(removeTrackerCount <= [removeIndexes count], @"Marked %ld trackers to remove, but only removing %ld rows", removeTrackerCount, [removeIndexes count]);
NSAssert2(removeTrackerCount <= removeIndexes.count, @"Marked %ld trackers to remove, but only removing %ld rows", removeTrackerCount, removeIndexes.count);
//we might have no trackers if remove right after a failed add (race condition ftw)
#warning look into having a failed add apply right away, so that this can become an assert
if (removeTrackerCount == 0)
return;
if ([[NSUserDefaults standardUserDefaults] boolForKey: @"WarningRemoveTrackers"])
if ([NSUserDefaults.standardUserDefaults boolForKey: @"WarningRemoveTrackers"])
{
NSAlert * alert = [[NSAlert alloc] init];
if (removeTrackerCount > 1)
{
[alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Are you sure you want to remove %d trackers?",
"Remove trackers alert -> title"), removeTrackerCount]];
[alert setInformativeText: NSLocalizedString(@"Once removed, Transmission will no longer attempt to contact them."
" This cannot be undone.", "Remove trackers alert -> message")];
alert.messageText = [NSString stringWithFormat: NSLocalizedString(@"Are you sure you want to remove %d trackers?",
"Remove trackers alert -> title"), removeTrackerCount];
alert.informativeText = NSLocalizedString(@"Once removed, Transmission will no longer attempt to contact them."
" This cannot be undone.", "Remove trackers alert -> message");
}
else
{
[alert setMessageText: NSLocalizedString(@"Are you sure you want to remove this tracker?", "Remove trackers alert -> title")];
[alert setInformativeText: NSLocalizedString(@"Once removed, Transmission will no longer attempt to contact it."
" This cannot be undone.", "Remove trackers alert -> message")];
alert.messageText = NSLocalizedString(@"Are you sure you want to remove this tracker?", "Remove trackers alert -> title");
alert.informativeText = NSLocalizedString(@"Once removed, Transmission will no longer attempt to contact it."
" This cannot be undone.", "Remove trackers alert -> message");
}
[alert addButtonWithTitle: NSLocalizedString(@"Remove", "Remove trackers alert -> button")];
[alert addButtonWithTitle: NSLocalizedString(@"Cancel", "Remove trackers alert -> button")];
[alert setShowsSuppressionButton: YES];
alert.showsSuppressionButton = YES;
NSInteger result = [alert runModal];
if ([[alert suppressionButton] state] == NSOnState)
[[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningRemoveTrackers"];
if (alert.suppressionButton.state == NSOnState)
[NSUserDefaults.standardUserDefaults setBool: NO forKey: @"WarningRemoveTrackers"];
if (result != NSAlertFirstButtonReturn)
return;
@ -391,7 +392,7 @@
//reset table with either new or old value
fTrackers = [[NSMutableArray alloc] init];
for (Torrent * torrent in fTorrents)
[fTrackers addObjectsFromArray: [torrent allTrackerStats]];
[fTrackers addObjectsFromArray: torrent.allTrackerStats];
[fTrackerTable removeRowsAtIndexes: removeIndexes withAnimation: NSTableViewAnimationSlideLeft];
@ -399,7 +400,7 @@
[fTrackerTable endUpdates];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil]; //incase sort by tracker
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateUI" object: nil]; //incase sort by tracker
}
@end

4
macosx/InfoWindowController.h
View File

@ -61,8 +61,8 @@
- (void) setNextTab;
- (void) setPreviousTab;
- (NSArray *) quickLookURLs;
- (BOOL) canQuickLook;
@property (nonatomic, readonly) NSArray *quickLookURLs;
@property (nonatomic, readonly) BOOL canQuickLook;
- (NSRect) quickLookSourceFrameForPreviewItem: (id <QLPreviewItem>) item;
@end

169
macosx/InfoWindowController.m
View File

@ -44,15 +44,14 @@
#define INVALID -99
typedef enum
{
typedef NS_ENUM(unsigned int, tabTag) {
TAB_GENERAL_TAG = 0,
TAB_ACTIVITY_TAG = 1,
TAB_TRACKERS_TAG = 2,
TAB_PEERS_TAG = 3,
TAB_FILE_TAG = 4,
TAB_OPTIONS_TAG = 5
} tabTag;
};
@interface InfoWindowController (Private)
@ -63,7 +62,7 @@ typedef enum
@implementation InfoWindowController
- (id) init
- (instancetype) init
{
self = [super initWithWindowNibName: @"InfoWindow"];
return self;
@ -71,25 +70,25 @@ typedef enum
- (void) awakeFromNib
{
[fNoneSelectedField setStringValue: NSLocalizedString(@"No Torrents Selected", "Inspector -> selected torrents")];
fNoneSelectedField.stringValue = NSLocalizedString(@"No Torrents Selected", "Inspector -> selected torrents");
//window location and size
NSPanel * window = (NSPanel *)[self window];
NSPanel * window = (NSPanel *)self.window;
[window setFloatingPanel: NO];
window.floatingPanel = NO;
const CGFloat windowHeight = NSHeight([window frame]);
fMinWindowWidth = [window minSize].width;
const CGFloat windowHeight = NSHeight(window.frame);
fMinWindowWidth = window.minSize.width;
[window setFrameAutosaveName: @"InspectorWindow"];
[window setFrameUsingName: @"InspectorWindow"];
NSRect windowRect = [window frame];
NSRect windowRect = window.frame;
windowRect.origin.y -= windowHeight - NSHeight(windowRect);
windowRect.size.height = windowHeight;
[window setFrame: windowRect display: NO];
[window setBecomesKeyOnlyIfNeeded: YES];
window.becomesKeyOnlyIfNeeded = YES;
//set tab tooltips
[fTabMatrix setToolTip: NSLocalizedString(@"General Info", "Inspector -> tab") forCell: [fTabMatrix cellWithTag: TAB_GENERAL_TAG]];
@ -101,7 +100,7 @@ typedef enum
//set selected tab
fCurrentTabTag = INVALID;
NSString * identifier = [[NSUserDefaults standardUserDefaults] stringForKey: @"InspectorSelected"];
NSString * identifier = [NSUserDefaults.standardUserDefaults stringForKey: @"InspectorSelected"];
NSInteger tag;
if ([identifier isEqualToString: TAB_INFO_IDENT])
tag = TAB_GENERAL_TAG;
@ -117,17 +116,17 @@ typedef enum
tag = TAB_OPTIONS_TAG;
else //safety
{
[[NSUserDefaults standardUserDefaults] setObject: TAB_INFO_IDENT forKey: @"InspectorSelected"];
[NSUserDefaults.standardUserDefaults setObject: TAB_INFO_IDENT forKey: @"InspectorSelected"];
tag = TAB_GENERAL_TAG;
}
[fTabMatrix selectCellWithTag: tag];
[self setTab: nil];
//set blank inspector
[self setInfoForTorrents: [NSArray array]];
[self setInfoForTorrents: @[]];
//allow for update notifications
NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
NSNotificationCenter * nc = NSNotificationCenter.defaultCenter;
[nc addObserver: self selector: @selector(resetInfoForTorrent:) name: @"ResetInspector" object: nil];
[nc addObserver: self selector: @selector(updateInfoStats) name: @"UpdateStats" object: nil];
[nc addObserver: self selector: @selector(updateOptions) name: @"UpdateOptions" object: nil];
@ -135,7 +134,7 @@ typedef enum
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[NSNotificationCenter.defaultCenter removeObserver: self];
if ([fViewController respondsToSelector: @selector(saveViewSize)])
[fViewController saveViewSize];
@ -153,14 +152,14 @@ typedef enum
- (NSRect) windowWillUseStandardFrame: (NSWindow *) window defaultFrame: (NSRect) defaultFrame
{
NSRect windowRect = [window frame];
windowRect.size.width = [window minSize].width;
NSRect windowRect = window.frame;
windowRect.size.width = window.minSize.width;
return windowRect;
}
- (void) windowWillClose: (NSNotification *) notification
{
if (fCurrentTabTag == TAB_FILE_TAG && ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]))
if (fCurrentTabTag == TAB_FILE_TAG && ([QLPreviewPanel sharedPreviewPanelExists] && [QLPreviewPanel sharedPreviewPanel].visible))
[[QLPreviewPanel sharedPreviewPanel] reloadData];
}
@ -184,8 +183,8 @@ typedef enum
if ([fViewController respondsToSelector: @selector(clearView)])
[fViewController clearView];
NSView * oldView = [fViewController view];
oldHeight = NSHeight([oldView frame]);
NSView * oldView = fViewController.view;
oldHeight = NSHeight(oldView.frame);
//remove old view
[oldView removeFromSuperview];
@ -260,34 +259,34 @@ typedef enum
return;
}
[[NSUserDefaults standardUserDefaults] setObject: identifier forKey: @"InspectorSelected"];
[NSUserDefaults.standardUserDefaults setObject: identifier forKey: @"InspectorSelected"];
NSWindow * window = [self window];
NSWindow * window = self.window;
[window setTitle: [NSString stringWithFormat: @"%@ - %@", [fViewController title],
NSLocalizedString(@"Torrent Inspector", "Inspector -> title")]];
window.title = [NSString stringWithFormat: @"%@ - %@", fViewController.title,
NSLocalizedString(@"Torrent Inspector", "Inspector -> title")];
//selected tab item
[(InfoTabButtonCell *)[fTabMatrix selectedCell] setSelectedTab: YES];
[(InfoTabButtonCell *)fTabMatrix.selectedCell setSelectedTab: YES];
NSView * view = [fViewController view];
NSView * view = fViewController.view;
[fViewController updateInfo];
NSRect windowRect = [window frame], viewRect = [view frame];
NSRect windowRect = window.frame, viewRect = view.frame;
const CGFloat difference = NSHeight(viewRect) - oldHeight;
windowRect.origin.y -= difference;
windowRect.size.height += difference;
const CGFloat minWindowWidth = MAX(fMinWindowWidth, [view fittingSize].width);
const CGFloat minWindowWidth = MAX(fMinWindowWidth, view.fittingSize.width);
windowRect.size.width = MAX(NSWidth(windowRect), minWindowWidth);
if ([fViewController respondsToSelector: @selector(saveViewSize)]) //a little bit hacky, but avoids requiring an extra method
{
if ([window screen])
if (window.screen)
{
const CGFloat screenHeight = NSHeight([[window screen] visibleFrame]);
const CGFloat screenHeight = NSHeight(window.screen.visibleFrame);
if (NSHeight(windowRect) > screenHeight)
{
const CGFloat difference = screenHeight - NSHeight(windowRect);
@ -298,39 +297,39 @@ typedef enum
}
}
[window setMinSize: NSMakeSize(minWindowWidth, NSHeight(windowRect) - NSHeight(viewRect) + TAB_MIN_HEIGHT)];
[window setMaxSize: NSMakeSize(FLT_MAX, FLT_MAX)];
window.minSize = NSMakeSize(minWindowWidth, NSHeight(windowRect) - NSHeight(viewRect) + TAB_MIN_HEIGHT);
window.maxSize = NSMakeSize(FLT_MAX, FLT_MAX);
}
else
{
[window setMinSize: NSMakeSize(minWindowWidth, NSHeight(windowRect))];
[window setMaxSize: NSMakeSize(FLT_MAX, NSHeight(windowRect))];
window.minSize = NSMakeSize(minWindowWidth, NSHeight(windowRect));
window.maxSize = NSMakeSize(FLT_MAX, NSHeight(windowRect));
}
viewRect.size.width = NSWidth(windowRect);
[view setFrame: viewRect];
view.frame = viewRect;
[window setFrame: windowRect display: YES animate: oldTabTag != INVALID];
[[window contentView] addSubview: view];
[window.contentView addSubview: view];
[[window contentView] addConstraints: [NSLayoutConstraint constraintsWithVisualFormat: @"H:|-0-[view]-0-|"
[window.contentView addConstraints: [NSLayoutConstraint constraintsWithVisualFormat: @"H:|-0-[view]-0-|"
options: 0
metrics: nil
views: @{ @"view": view }]];
[[window contentView] addConstraints: [NSLayoutConstraint constraintsWithVisualFormat: @"V:[tabs]-0-[view]-0-|"
[window.contentView addConstraints: [NSLayoutConstraint constraintsWithVisualFormat: @"V:[tabs]-0-[view]-0-|"
options: 0
metrics: nil
views: @{ @"tabs": fTabMatrix, @"view": view }]];
if ((fCurrentTabTag == TAB_FILE_TAG || oldTabTag == TAB_FILE_TAG)
&& ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]))
&& ([QLPreviewPanel sharedPreviewPanelExists] && [QLPreviewPanel sharedPreviewPanel].visible))
[[QLPreviewPanel sharedPreviewPanel] reloadData];
}
- (void) setNextTab
{
NSInteger tag = [fTabMatrix selectedTag]+1;
if (tag >= [fTabMatrix numberOfColumns])
if (tag >= fTabMatrix.numberOfColumns)
tag = 0;
[fTabMatrix selectCellWithTag: tag];
@ -341,7 +340,7 @@ typedef enum
{
NSInteger tag = [fTabMatrix selectedTag]-1;
if (tag < 0)
tag = [fTabMatrix numberOfColumns]-1;
tag = fTabMatrix.numberOfColumns-1;
[fTabMatrix selectCellWithTag: tag];
[self setTab: nil];
@ -349,9 +348,9 @@ typedef enum
- (void) swipeWithEvent: (NSEvent *) event
{
if ([event deltaX] < 0.0)
if (event.deltaX < 0.0)
[self setNextTab];
else if ([event deltaX] > 0.0)
else if (event.deltaX > 0.0)
[self setPreviousTab];
}
@ -367,15 +366,15 @@ typedef enum
- (NSArray *) quickLookURLs
{
return [fFileViewController quickLookURLs];
return fFileViewController.quickLookURLs;
}
- (BOOL) canQuickLook
{
if (fCurrentTabTag != TAB_FILE_TAG || ![[self window] isVisible])
if (fCurrentTabTag != TAB_FILE_TAG || !self.window.visible)
return NO;
return [fFileViewController canQuickLook];
return fFileViewController.canQuickLook;
}
- (NSRect) quickLookSourceFrameForPreviewItem: (id <QLPreviewItem>) item
@ -389,25 +388,25 @@ typedef enum
- (void) resetInfo
{
const NSUInteger numberSelected = [fTorrents count];
const NSUInteger numberSelected = fTorrents.count;
if (numberSelected != 1)
{
if (numberSelected > 0)
{
[fImageView setImage: [NSImage imageNamed: NSImageNameMultipleDocuments]];
fImageView.image = [NSImage imageNamed: NSImageNameMultipleDocuments];
[fNameField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ Torrents Selected",
fNameField.stringValue = [NSString stringWithFormat: NSLocalizedString(@"%@ Torrents Selected",
"Inspector -> selected torrents"),
[NSString formattedUInteger: numberSelected]]];
[fNameField setHidden: NO];
[NSString formattedUInteger: numberSelected]];
fNameField.hidden = NO;
uint64_t size = 0;
NSUInteger fileCount = 0, magnetCount = 0;
for (Torrent * torrent in fTorrents)
{
size += [torrent size];
fileCount += [torrent fileCount];
if ([torrent isMagnet])
size += torrent.size;
fileCount += torrent.fileCount;
if (torrent.magnet)
++magnetCount;
}
@ -437,52 +436,52 @@ typedef enum
if (magnetCount < numberSelected)
{
[fBasicInfoField setStringValue: [NSString stringWithFormat: @"%@, %@", fileString,
fBasicInfoField.stringValue = [NSString stringWithFormat: @"%@, %@", fileString,
[NSString stringWithFormat: NSLocalizedString(@"%@ total", "Inspector -> selected torrents"),
[NSString stringForFileSize: size]]]];
[NSString stringForFileSize: size]]];
NSByteCountFormatter * formatter = [[NSByteCountFormatter alloc] init];
[formatter setAllowedUnits: NSByteCountFormatterUseBytes];
[fBasicInfoField setToolTip: [formatter stringFromByteCount: size]];
formatter.allowedUnits = NSByteCountFormatterUseBytes;
fBasicInfoField.toolTip = [formatter stringFromByteCount: size];
}
else
{
[fBasicInfoField setStringValue: fileString];
[fBasicInfoField setToolTip: nil];
fBasicInfoField.stringValue = fileString;
fBasicInfoField.toolTip = nil;
}
[fBasicInfoField setHidden: NO];
fBasicInfoField.hidden = NO;
[fNoneSelectedField setHidden: YES];
fNoneSelectedField.hidden = YES;
}
else
{
[fImageView setImage: [NSImage imageNamed: NSImageNameApplicationIcon]];
[fNoneSelectedField setHidden: NO];
fImageView.image = [NSImage imageNamed: NSImageNameApplicationIcon];
fNoneSelectedField.hidden = NO;
[fNameField setHidden: YES];
[fBasicInfoField setHidden: YES];
fNameField.hidden = YES;
fBasicInfoField.hidden = YES;
}
[fNameField setToolTip: nil];
fNameField.toolTip = nil;
}
else
{
Torrent * torrent = fTorrents[0];
[fImageView setImage: [torrent icon]];
fImageView.image = torrent.icon;
NSString * name = [torrent name];
[fNameField setStringValue: name];
[fNameField setToolTip: name];
[fNameField setHidden: NO];
NSString * name = torrent.name;
fNameField.stringValue = name;
fNameField.toolTip = name;
fNameField.hidden = NO;
if (![torrent isMagnet])
if (!torrent.magnet)
{
NSString * basicString = [NSString stringForFileSize: [torrent size]];
if ([torrent isFolder])
NSString * basicString = [NSString stringForFileSize: torrent.size];
if (torrent.folder)
{
NSString * fileString;
const NSUInteger fileCount = [torrent fileCount];
const NSUInteger fileCount = torrent.fileCount;
if (fileCount == 1)
fileString = NSLocalizedString(@"1 file", "Inspector -> selected torrents");
else
@ -490,20 +489,20 @@ typedef enum
[NSString formattedUInteger: fileCount]];
basicString = [NSString stringWithFormat: @"%@, %@", fileString, basicString];
}
[fBasicInfoField setStringValue: basicString];
fBasicInfoField.stringValue = basicString;
NSByteCountFormatter * formatter = [[NSByteCountFormatter alloc] init];
[formatter setAllowedUnits: NSByteCountFormatterUseBytes];
[fBasicInfoField setToolTip: [formatter stringFromByteCount: [torrent size]]];
formatter.allowedUnits = NSByteCountFormatterUseBytes;
fBasicInfoField.toolTip = [formatter stringFromByteCount: torrent.size];
}
else
{
[fBasicInfoField setStringValue: NSLocalizedString(@"Magnetized transfer", "Inspector -> selected torrents")];
[fBasicInfoField setToolTip: nil];
fBasicInfoField.stringValue = NSLocalizedString(@"Magnetized transfer", "Inspector -> selected torrents");
fBasicInfoField.toolTip = nil;
}
[fBasicInfoField setHidden: NO];
fBasicInfoField.hidden = NO;
[fNoneSelectedField setHidden: YES];
fNoneSelectedField.hidden = YES;
}
[fGeneralViewController setInfoForTorrents: fTorrents];
@ -518,7 +517,7 @@ typedef enum
- (void) resetInfoForTorrent: (NSNotification *) notification
{
Torrent * torrent = [notification userInfo][@"Torrent"];
Torrent * torrent = notification.userInfo[@"Torrent"];
if (fTorrents && (!torrent || [fTorrents containsObject: torrent]))
[self resetInfo];
}

156
macosx/MessageWindowController.m
View File

@ -46,70 +46,70 @@
@implementation MessageWindowController
- (id) init
- (instancetype) init
{
return [super initWithWindowNibName: @"MessageWindow"];
}
- (void) awakeFromNib
{
NSWindow * window = [self window];
[window setFrameAutosaveName: @"MessageWindowFrame"];
NSWindow * window = self.window;
window.frameAutosaveName = @"MessageWindowFrame";
[window setFrameUsingName: @"MessageWindowFrame"];
[window setRestorationClass: [self class]];
window.restorationClass = [self class];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(resizeColumn)
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(resizeColumn)
name: NSTableViewColumnDidResizeNotification object: fMessageTable];
[window setContentBorderThickness: NSMinY([[fMessageTable enclosingScrollView] frame]) forEdge: NSMinYEdge];
[window setContentBorderThickness: NSMinY(fMessageTable.enclosingScrollView.frame) forEdge: NSMinYEdge];
[[self window] setTitle: NSLocalizedString(@"Message Log", "Message window -> title")];
self.window.title = NSLocalizedString(@"Message Log", "Message window -> title");
//set images and text for popup button items
[[fLevelButton itemAtIndex: LEVEL_ERROR] setTitle: NSLocalizedString(@"Error", "Message window -> level string")];
[[fLevelButton itemAtIndex: LEVEL_INFO] setTitle: NSLocalizedString(@"Info", "Message window -> level string")];
[[fLevelButton itemAtIndex: LEVEL_DEBUG] setTitle: NSLocalizedString(@"Debug", "Message window -> level string")];
[fLevelButton itemAtIndex: LEVEL_ERROR].title = NSLocalizedString(@"Error", "Message window -> level string");
[fLevelButton itemAtIndex: LEVEL_INFO].title = NSLocalizedString(@"Info", "Message window -> level string");
[fLevelButton itemAtIndex: LEVEL_DEBUG].title = NSLocalizedString(@"Debug", "Message window -> level string");
const CGFloat levelButtonOldWidth = NSWidth([fLevelButton frame]);
const CGFloat levelButtonOldWidth = NSWidth(fLevelButton.frame);
[fLevelButton sizeToFit];
//set table column text
[[[fMessageTable tableColumnWithIdentifier: @"Date"] headerCell] setTitle: NSLocalizedString(@"Date",
"Message window -> table column")];
[[[fMessageTable tableColumnWithIdentifier: @"Name"] headerCell] setTitle: NSLocalizedString(@"Process",
"Message window -> table column")];
[[[fMessageTable tableColumnWithIdentifier: @"Message"] headerCell] setTitle: NSLocalizedString(@"Message",
"Message window -> table column")];
[fMessageTable tableColumnWithIdentifier: @"Date"].headerCell.title = NSLocalizedString(@"Date",
"Message window -> table column");
[fMessageTable tableColumnWithIdentifier: @"Name"].headerCell.title = NSLocalizedString(@"Process",
"Message window -> table column");
[fMessageTable tableColumnWithIdentifier: @"Message"].headerCell.title = NSLocalizedString(@"Message",
"Message window -> table column");
//set and size buttons
[fSaveButton setTitle: [NSLocalizedString(@"Save", "Message window -> save button") stringByAppendingEllipsis]];
fSaveButton.title = [NSLocalizedString(@"Save", "Message window -> save button") stringByAppendingEllipsis];
[fSaveButton sizeToFit];
NSRect saveButtonFrame = [fSaveButton frame];
NSRect saveButtonFrame = fSaveButton.frame;
saveButtonFrame.size.width += 10.0;
saveButtonFrame.origin.x += NSWidth([fLevelButton frame]) - levelButtonOldWidth;
[fSaveButton setFrame: saveButtonFrame];
saveButtonFrame.origin.x += NSWidth(fLevelButton.frame) - levelButtonOldWidth;
fSaveButton.frame = saveButtonFrame;
const CGFloat oldClearButtonWidth = [fClearButton frame].size.width;
const CGFloat oldClearButtonWidth = fClearButton.frame.size.width;
[fClearButton setTitle: NSLocalizedString(@"Clear", "Message window -> save button")];
fClearButton.title = NSLocalizedString(@"Clear", "Message window -> save button");
[fClearButton sizeToFit];
NSRect clearButtonFrame = [fClearButton frame];
NSRect clearButtonFrame = fClearButton.frame;
clearButtonFrame.size.width = MAX(clearButtonFrame.size.width + 10.0, saveButtonFrame.size.width);
clearButtonFrame.origin.x -= NSWidth(clearButtonFrame) - oldClearButtonWidth;
[fClearButton setFrame: clearButtonFrame];
fClearButton.frame = clearButtonFrame;
[[fFilterField cell] setPlaceholderString: NSLocalizedString(@"Filter", "Message window -> filter field")];
NSRect filterButtonFrame = [fFilterField frame];
[fFilterField.cell setPlaceholderString: NSLocalizedString(@"Filter", "Message window -> filter field")];
NSRect filterButtonFrame = fFilterField.frame;
filterButtonFrame.origin.x -= NSWidth(clearButtonFrame) - oldClearButtonWidth;
[fFilterField setFrame: filterButtonFrame];
fFilterField.frame = filterButtonFrame;
fAttributes = [[[[fMessageTable tableColumnWithIdentifier: @"Message"] dataCell] attributedStringValue]
fAttributes = [[[fMessageTable tableColumnWithIdentifier: @"Message"].dataCell attributedStringValue]
attributesAtIndex: 0 effectiveRange: NULL];
//select proper level in popup button
switch ([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"])
switch ([NSUserDefaults.standardUserDefaults integerForKey: @"MessageLevel"])
{
case TR_LOG_ERROR:
[fLevelButton selectItemAtIndex: LEVEL_ERROR];
@ -121,7 +121,7 @@
[fLevelButton selectItemAtIndex: LEVEL_DEBUG];
break;
default: //safety
[[NSUserDefaults standardUserDefaults] setInteger: TR_LOG_ERROR forKey: @"MessageLevel"];
[NSUserDefaults.standardUserDefaults setInteger: TR_LOG_ERROR forKey: @"MessageLevel"];
[fLevelButton selectItemAtIndex: LEVEL_ERROR];
}
@ -133,7 +133,7 @@
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[NSNotificationCenter.defaultCenter removeObserver: self];
[fTimer invalidate];
}
@ -156,7 +156,7 @@
{
NSAssert1([identifier isEqualToString: @"MessageWindow"], @"Trying to restore unexpected identifier %@", identifier);
NSWindow * window = [[(Controller *)[NSApp delegate] messageWindowController] window];
NSWindow * window = ((Controller *)NSApp.delegate).messageWindowController.window;
completionHandler(window, nil);
}
@ -177,21 +177,21 @@
static NSUInteger currentIndex = 0;
NSScroller * scroller = [[fMessageTable enclosingScrollView] verticalScroller];
const BOOL shouldScroll = currentIndex == 0 || [scroller floatValue] == 1.0 || [scroller isHidden]
|| [scroller knobProportion] == 1.0;
NSScroller * scroller = fMessageTable.enclosingScrollView.verticalScroller;
const BOOL shouldScroll = currentIndex == 0 || scroller.floatValue == 1.0 || scroller.hidden
|| scroller.knobProportion == 1.0;
const NSInteger maxLevel = [[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"];
NSString * filterString = [fFilterField stringValue];
const NSInteger maxLevel = [NSUserDefaults.standardUserDefaults integerForKey: @"MessageLevel"];
NSString * filterString = fFilterField.stringValue;
BOOL changed = NO;
for (tr_log_message * currentMessage = messages; currentMessage != NULL; currentMessage = currentMessage->next)
{
NSString * name = currentMessage->name != NULL ? @(currentMessage->name)
: [[NSProcessInfo processInfo] processName];
: NSProcessInfo.processInfo.processName;
NSString * file = [[@(currentMessage->file) lastPathComponent] stringByAppendingFormat: @":%d",
NSString * file = [(@(currentMessage->file)).lastPathComponent stringByAppendingFormat: @":%d",
currentMessage->line];
NSDictionary * message = @{
@ -210,26 +210,26 @@
}
}
if ([fMessages count] > TR_LOG_MAX_QUEUE_LENGTH)
if (fMessages.count > TR_LOG_MAX_QUEUE_LENGTH)
{
const NSUInteger oldCount = [fDisplayedMessages count];
const NSUInteger oldCount = fDisplayedMessages.count;
NSIndexSet * removeIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fMessages count]-TR_LOG_MAX_QUEUE_LENGTH)];
NSIndexSet * removeIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, fMessages.count-TR_LOG_MAX_QUEUE_LENGTH)];
NSArray * itemsToRemove = [fMessages objectsAtIndexes: removeIndexes];
[fMessages removeObjectsAtIndexes: removeIndexes];
[fDisplayedMessages removeObjectsInArray: itemsToRemove];
changed |= oldCount > [fDisplayedMessages count];
changed |= oldCount > fDisplayedMessages.count;
}
if (changed)
{
[fDisplayedMessages sortUsingDescriptors: [fMessageTable sortDescriptors]];
[fDisplayedMessages sortUsingDescriptors: fMessageTable.sortDescriptors];
[fMessageTable reloadData];
if (shouldScroll)
[fMessageTable scrollRowToVisible: [fMessageTable numberOfRows]-1];
[fMessageTable scrollRowToVisible: fMessageTable.numberOfRows-1];
}
[fLock unlock];
@ -239,12 +239,12 @@
- (NSInteger) numberOfRowsInTableView: (NSTableView *) tableView
{
return [fDisplayedMessages count];
return fDisplayedMessages.count;
}
- (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) column row: (NSInteger) row
{
NSString * ident = [column identifier];
NSString * ident = column.identifier;
NSDictionary * message = fDisplayedMessages[row];
if ([ident isEqualToString: @"Date"])
@ -277,14 +277,14 @@
NSString * message = fDisplayedMessages[row][@"Message"];
NSTableColumn * column = [tableView tableColumnWithIdentifier: @"Message"];
const CGFloat count = floorf([message sizeWithAttributes: fAttributes].width / [column width]);
const CGFloat count = floorf([message sizeWithAttributes: fAttributes].width / column.width);
return [tableView rowHeight] * (count + 1.0);
return tableView.rowHeight * (count + 1.0);
}
- (void) tableView: (NSTableView *) tableView sortDescriptorsDidChange: (NSArray *) oldDescriptors
{
[fDisplayedMessages sortUsingDescriptors: [fMessageTable sortDescriptors]];
[fDisplayedMessages sortUsingDescriptors: fMessageTable.sortDescriptors];
[fMessageTable reloadData];
}
@ -297,25 +297,25 @@
- (void) copy: (id) sender
{
NSIndexSet * indexes = [fMessageTable selectedRowIndexes];
NSMutableArray * messageStrings = [NSMutableArray arrayWithCapacity: [indexes count]];
NSIndexSet * indexes = fMessageTable.selectedRowIndexes;
NSMutableArray * messageStrings = [NSMutableArray arrayWithCapacity: indexes.count];
for (NSDictionary * message in [fDisplayedMessages objectsAtIndexes: indexes])
[messageStrings addObject: [self stringForMessage: message]];
NSString * messageString = [messageStrings componentsJoinedByString: @"\n"];
NSPasteboard * pb = [NSPasteboard generalPasteboard];
NSPasteboard * pb = NSPasteboard.generalPasteboard;
[pb clearContents];
[pb writeObjects: @[messageString]];
}
- (BOOL) validateMenuItem: (NSMenuItem *) menuItem
{
SEL action = [menuItem action];
SEL action = menuItem.action;
if (action == @selector(copy:))
return [fMessageTable numberOfSelectedRows] > 0;
return fMessageTable.numberOfSelectedRows > 0;
return YES;
}
@ -323,7 +323,7 @@
- (void) changeLevel: (id) sender
{
NSInteger level;
switch ([fLevelButton indexOfSelectedItem])
switch (fLevelButton.indexOfSelectedItem)
{
case LEVEL_ERROR:
level = TR_LOG_ERROR;
@ -339,10 +339,10 @@
level = TR_LOG_INFO;
}
if ([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"] == level)
if ([NSUserDefaults.standardUserDefaults integerForKey: @"MessageLevel"] == level)
return;
[[NSUserDefaults standardUserDefaults] setInteger: level forKey: @"MessageLevel"];
[NSUserDefaults.standardUserDefaults setInteger: level forKey: @"MessageLevel"];
[fLock lock];
@ -367,7 +367,7 @@
[fMessages removeAllObjects];
[fMessageTable beginUpdates];
[fMessageTable removeRowsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fDisplayedMessages count])] withAnimation: NSTableViewAnimationSlideLeft];
[fMessageTable removeRowsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, fDisplayedMessages.count)] withAnimation: NSTableViewAnimationSlideLeft];
[fDisplayedMessages removeAllObjects];
@ -379,35 +379,35 @@
- (void) writeToFile: (id) sender
{
NSSavePanel * panel = [NSSavePanel savePanel];
[panel setAllowedFileTypes: @[@"txt"]];
[panel setCanSelectHiddenExtension: YES];
panel.allowedFileTypes = @[@"txt"];
panel.canSelectHiddenExtension = YES;
[panel setNameFieldStringValue: NSLocalizedString(@"untitled", "Save log panel -> default file name")];
panel.nameFieldStringValue = NSLocalizedString(@"untitled", "Save log panel -> default file name");
[panel beginSheetModalForWindow: [self window] completionHandler: ^(NSInteger result) {
[panel beginSheetModalForWindow: self.window completionHandler: ^(NSInteger result) {
if (result == NSFileHandlingPanelOKButton)
{
//make the array sorted by date
NSSortDescriptor * descriptor = [NSSortDescriptor sortDescriptorWithKey: @"Index" ascending: YES];
NSArray * descriptors = [[NSArray alloc] initWithObjects: descriptor, nil];
NSArray * descriptors = @[descriptor];
NSArray * sortedMessages = [fDisplayedMessages sortedArrayUsingDescriptors: descriptors];
//create the text to output
NSMutableArray * messageStrings = [NSMutableArray arrayWithCapacity: [sortedMessages count]];
NSMutableArray * messageStrings = [NSMutableArray arrayWithCapacity: sortedMessages.count];
for (NSDictionary * message in sortedMessages)
[messageStrings addObject: [self stringForMessage: message]];
NSString * fileString = [messageStrings componentsJoinedByString: @"\n"];
if (![fileString writeToFile: [[panel URL] path] atomically: YES encoding: NSUTF8StringEncoding error: nil])
if (![fileString writeToFile: panel.URL.path atomically: YES encoding: NSUTF8StringEncoding error: nil])
{
NSAlert * alert = [[NSAlert alloc] init];
[alert addButtonWithTitle: NSLocalizedString(@"OK", "Save log alert panel -> button")];
[alert setMessageText: NSLocalizedString(@"Log Could Not Be Saved", "Save log alert panel -> title")];
[alert setInformativeText: [NSString stringWithFormat:
alert.messageText = NSLocalizedString(@"Log Could Not Be Saved", "Save log alert panel -> title");
alert.informativeText = [NSString stringWithFormat:
NSLocalizedString(@"There was a problem creating the file \"%@\".",
"Save log alert panel -> message"), [[[panel URL] path] lastPathComponent]]];
[alert setAlertStyle: NSWarningAlertStyle];
"Save log alert panel -> message"), panel.URL.path.lastPathComponent];
alert.alertStyle = NSWarningAlertStyle;
[alert runModal];
}
@ -422,7 +422,7 @@
- (void) resizeColumn
{
[fMessageTable noteHeightOfRowsWithIndexesChanged: [NSIndexSet indexSetWithIndexesInRange:
NSMakeRange(0, [fMessageTable numberOfRows])]];
NSMakeRange(0, fMessageTable.numberOfRows)]];
}
- (BOOL) shouldIncludeMessageForFilter: (NSString *) filterString message: (NSDictionary *) message
@ -437,14 +437,14 @@
- (void) updateListForFilter
{
const NSInteger level = [[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"];
NSString * filterString = [fFilterField stringValue];
const NSInteger level = [NSUserDefaults.standardUserDefaults integerForKey: @"MessageLevel"];
NSString * filterString = fFilterField.stringValue;
NSIndexSet * indexes = [fMessages indexesOfObjectsWithOptions: NSEnumerationConcurrent passingTest: ^BOOL(id message, NSUInteger idx, BOOL * stop) {
return [((NSDictionary *)message)[@"Level"] integerValue] <= level && [self shouldIncludeMessageForFilter: filterString message: message];
}];
NSArray * tempMessages = [[fMessages objectsAtIndexes: indexes] sortedArrayUsingDescriptors: [fMessageTable sortDescriptors]];
NSArray * tempMessages = [[fMessages objectsAtIndexes: indexes] sortedArrayUsingDescriptors: fMessageTable.sortDescriptors];
[fMessageTable beginUpdates];
@ -455,7 +455,7 @@
for (NSDictionary * message in tempMessages)
{
const NSUInteger previousIndex = [fDisplayedMessages indexOfObject: message inRange: NSMakeRange(currentIndex, [fDisplayedMessages count]-currentIndex)];
const NSUInteger previousIndex = [fDisplayedMessages indexOfObject: message inRange: NSMakeRange(currentIndex, fDisplayedMessages.count-currentIndex)];
if (previousIndex == NSNotFound)
{
[itemsToAdd addObject: message];
@ -475,9 +475,9 @@
}
//remove trailing items - those are the unused
if (currentIndex < [fDisplayedMessages count])
if (currentIndex < fDisplayedMessages.count)
{
const NSRange removeRange = NSMakeRange(currentIndex, [fDisplayedMessages count]-currentIndex);
const NSRange removeRange = NSMakeRange(currentIndex, fDisplayedMessages.count-currentIndex);
[fDisplayedMessages removeObjectsInRange: removeRange];
[fMessageTable removeRowsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: removeRange] withAnimation: NSTableViewAnimationSlideDown];
}

4
macosx/NSApplicationAdditions.h
View File

@ -24,7 +24,7 @@
@interface NSApplication (NSApplicationAdditions)
- (BOOL) isOnMojaveOrBetter;
- (BOOL) isDarkMode;
@property (nonatomic, getter=isOnMojaveOrBetter, readonly) BOOL onMojaveOrBetter;
@property (nonatomic, getter=isDarkMode, readonly) BOOL darkMode;
@end

2
macosx/NSImageAdditions.m
View File

@ -32,7 +32,7 @@
[color set];
const NSSize size = [coloredImage size];
const NSSize size = coloredImage.size;
NSRectFillUsingOperation(NSMakeRect(0.0, 0.0, size.width, size.height), NSCompositeSourceAtop);
[coloredImage unlockFocus];

2
macosx/NSStringAdditions.h
View File

@ -24,7 +24,7 @@
@interface NSString (NSStringAdditions)
+ (NSString *) ellipsis;
@property (nonatomic, class, readonly) NSString * ellipsis;
- (NSString *) stringByAppendingEllipsis;
+ (NSString *) formattedUInteger: (NSUInteger) value;

16
macosx/NSStringAdditions.m
View File

@ -43,7 +43,7 @@
- (NSString *) stringByAppendingEllipsis
{
return [self stringByAppendingString: [NSString ellipsis]];
return [self stringByAppendingString: NSString.ellipsis];
}
#warning use localizedStringWithFormat: directly when 10.9-only and stringsdict translations are in place
@ -76,7 +76,7 @@
partialUnitsSame = magnitudePartial == magnitudeFull;
}
[fileSizeFormatter setIncludesUnit: !partialUnitsSame];
fileSizeFormatter.includesUnit = !partialUnitsSame;
NSString * partialString = [fileSizeFormatter stringFromByteCount: partialSize];
@ -127,16 +127,16 @@
- (NSComparisonResult) compareNumeric: (NSString *) string
{
const NSStringCompareOptions comparisonOptions = NSNumericSearch | NSForcedOrderingSearch;
return [self compare: string options: comparisonOptions range: NSMakeRange(0, [self length]) locale: [NSLocale currentLocale]];
return [self compare: string options: comparisonOptions range: NSMakeRange(0, self.length) locale: NSLocale.currentLocale];
}
- (NSArray *) betterComponentsSeparatedByCharactersInSet: (NSCharacterSet *) separators
{
NSMutableArray * components = [NSMutableArray array];
NSCharacterSet * includededCharSet = [separators invertedSet];
NSCharacterSet * includededCharSet = separators.invertedSet;
NSUInteger index = 0;
const NSUInteger fullLength = [self length];
const NSUInteger fullLength = self.length;
do
{
const NSUInteger start = [self rangeOfCharacterFromSet: includededCharSet options: 0 range: NSMakeRange(index, fullLength - index)].location;
@ -195,9 +195,9 @@
//match Finder's behavior
NSNumberFormatter * numberFormatter = [[NSNumberFormatter alloc] init];
[numberFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
[numberFormatter setMinimumFractionDigits: 0];
[numberFormatter setMaximumFractionDigits: decimals];
numberFormatter.numberStyle = NSNumberFormatterDecimalStyle;
numberFormatter.minimumFractionDigits = 0;
numberFormatter.maximumFractionDigits = decimals;
NSString * fileSizeString = [numberFormatter stringFromNumber: @(convertedSize)];

10
macosx/PeerProgressIndicatorCell.m
View File

@ -41,19 +41,19 @@
- (void) drawWithFrame: (NSRect) cellFrame inView: (NSView *) controlView
{
if ([[NSUserDefaults standardUserDefaults] boolForKey: @"DisplayPeerProgressBarNumber"])
if ([NSUserDefaults.standardUserDefaults boolForKey: @"DisplayPeerProgressBarNumber"])
{
if (!fAttributes)
{
NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
[paragraphStyle setAlignment: NSRightTextAlignment];
NSMutableParagraphStyle * paragraphStyle = [NSParagraphStyle.defaultParagraphStyle mutableCopy];
paragraphStyle.alignment = NSRightTextAlignment;
fAttributes = @{NSFontAttributeName: [NSFont systemFontOfSize: 11.0],
NSForegroundColorAttributeName: NSColor.labelColor,
NSParagraphStyleAttributeName: paragraphStyle};
}
[[NSString percentString: [self floatValue] longDecimals: NO] drawInRect: cellFrame withAttributes: fAttributes];
[[NSString percentString: self.floatValue longDecimals: NO] drawInRect: cellFrame withAttributes: fAttributes];
}
else
{
@ -68,7 +68,7 @@
{
NSImage * checkImage = [NSImage imageNamed: @"CompleteCheck"];
const NSSize imageSize = [checkImage size];
const NSSize imageSize = checkImage.size;
const NSRect rect = NSMakeRect(floor(NSMidX(cellFrame) - imageSize.width * 0.5),
floor(NSMidY(cellFrame) - imageSize.height * 0.5),
imageSize.width, imageSize.height);

6
macosx/PeerTableView.m
View File

@ -26,13 +26,13 @@
- (void) mouseDown: (NSEvent *) event
{
NSPoint point = [self convertPoint: [event locationInWindow] fromView: nil];
NSPoint point = [self convertPoint: event.locationInWindow fromView: nil];
if ([self rowAtPoint: point] != -1 && [self columnAtPoint: point] == [self columnWithIdentifier: @"Progress"])
{
[[NSUserDefaults standardUserDefaults] setBool: ![[NSUserDefaults standardUserDefaults]
[NSUserDefaults.standardUserDefaults setBool: ![NSUserDefaults.standardUserDefaults
boolForKey: @"DisplayPeerProgressBarNumber"] forKey: @"DisplayPeerProgressBarNumber"];
NSIndexSet * rowIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [self numberOfRows])],
NSIndexSet * rowIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, self.numberOfRows)],
* columnIndexes = [NSIndexSet indexSetWithIndex: [self columnAtPoint: point]];
[self reloadDataForRowIndexes: rowIndexes columnIndexes: columnIndexes];
}

30
macosx/PiecesView.m
View File

@ -62,27 +62,27 @@ enum
{
[self clearView];
fTorrent = (torrent && ![torrent isMagnet]) ? torrent : nil;
fTorrent = (torrent && !torrent.magnet) ? torrent : nil;
if (fTorrent)
{
//determine relevant values
fNumPieces = MIN([fTorrent pieceCount], MAX_ACROSS * MAX_ACROSS);
fNumPieces = MIN(fTorrent.pieceCount, MAX_ACROSS * MAX_ACROSS);
fAcross = ceil(sqrt(fNumPieces));
const CGFloat width = [self bounds].size.width;
const CGFloat width = self.bounds.size.width;
fWidth = (width - (fAcross + 1) * BETWEEN) / fAcross;
fExtraBorder = (width - ((fWidth + BETWEEN) * fAcross + BETWEEN)) / 2;
}
NSImage * back = [[NSImage alloc] initWithSize: [self bounds].size];
NSImage * back = [[NSImage alloc] initWithSize: self.bounds.size];
[back lockFocus];
NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: [NSColor colorWithCalibratedWhite: 0.0 alpha: 0.4]
endingColor: [NSColor colorWithCalibratedWhite: 0.2 alpha: 0.4]];
[gradient drawInRect: [self bounds] angle: 90.0];
[gradient drawInRect: self.bounds angle: 90.0];
[back unlockFocus];
[self setImage: back];
self.image = back;
[self setNeedsDisplay];
}
@ -106,7 +106,7 @@ enum
int8_t * pieces = NULL;
float * piecesPercent = NULL;
const BOOL showAvailablity = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"];
const BOOL showAvailablity = [NSUserDefaults.standardUserDefaults boolForKey: @"PiecesViewShowAvailability"];
if (showAvailablity)
{
pieces = (int8_t *)tr_malloc(fNumPieces * sizeof(int8_t));
@ -118,7 +118,7 @@ enum
[fTorrent getAmountFinished: piecesPercent size: fNumPieces];
}
NSImage * image = [self image];
NSImage * image = self.image;
NSRect fillRects[fNumPieces];
NSColor * fillColors[fNumPieces];
@ -135,7 +135,7 @@ enum
{
if (!first && fPieces[index] != PIECE_FLASHING)
{
pieceColor = [NSColor orangeColor];
pieceColor = NSColor.orangeColor;
fPieces[index] = PIECE_FLASHING;
}
else
@ -149,7 +149,7 @@ enum
{
if (first || fPieces[index] != PIECE_NONE)
{
pieceColor = [NSColor whiteColor];
pieceColor = NSColor.whiteColor;
fPieces[index] = PIECE_NONE;
}
}
@ -166,7 +166,7 @@ enum
//always redraw "mixed"
CGFloat percent = showAvailablity ? (CGFloat)pieces[index]/HIGH_PEERS : piecesPercent[index];
NSColor * fullColor = showAvailablity ? fGreenAvailabilityColor : fBluePieceColor;
pieceColor = [[NSColor whiteColor] blendedColorWithFraction: percent ofColor: fullColor];
pieceColor = [NSColor.whiteColor blendedColorWithFraction: percent ofColor: fullColor];
fPieces[index] = PIECE_SOME;
}
@ -175,7 +175,7 @@ enum
const NSInteger across = index % fAcross,
down = index / fAcross;
fillRects[usedCount] = NSMakeRect(across * (fWidth + BETWEEN) + BETWEEN + fExtraBorder,
[image size].width - (down + 1) * (fWidth + BETWEEN) - fExtraBorder,
image.size.width - (down + 1) * (fWidth + BETWEEN) - fExtraBorder,
fWidth, fWidth);
fillColors[usedCount] = pieceColor;
@ -204,10 +204,10 @@ enum
{
if (fTorrent)
{
const BOOL availability = ![[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"];
[[NSUserDefaults standardUserDefaults] setBool: availability forKey: @"PiecesViewShowAvailability"];
const BOOL availability = ![NSUserDefaults.standardUserDefaults boolForKey: @"PiecesViewShowAvailability"];
[NSUserDefaults.standardUserDefaults setBool: availability forKey: @"PiecesViewShowAvailability"];
[self sendAction:[self action] to:[self target]];
[self sendAction:self.action to:self.target];
}
[super mouseDown: event];

9
macosx/PortChecker.h
View File

@ -22,13 +22,12 @@
#import <Cocoa/Cocoa.h>
typedef enum
{
typedef NS_ENUM(unsigned int, port_status_t) {
PORT_STATUS_CHECKING,
PORT_STATUS_OPEN,
PORT_STATUS_CLOSED,
PORT_STATUS_ERROR
} port_status_t;
};
@interface PortChecker : NSObject
{
@ -41,9 +40,9 @@ typedef enum
NSTimer * fTimer;
}
- (id) initForPort: (NSInteger) portNumber delay: (BOOL) delay withDelegate: (id) delegate;
- (instancetype) initForPort: (NSInteger) portNumber delay: (BOOL) delay withDelegate: (id) delegate;
- (void) cancelProbe;
- (port_status_t) status;
@property (nonatomic, readonly) port_status_t status;
@end

6
macosx/PortChecker.m
View File

@ -35,7 +35,7 @@
@implementation PortChecker
- (id) initForPort: (NSInteger) portNumber delay: (BOOL) delay withDelegate: (id) delegate
- (instancetype) initForPort: (NSInteger) portNumber delay: (BOOL) delay withDelegate: (id) delegate
{
if ((self = [super init]))
{
@ -71,7 +71,7 @@
- (void) connection: (NSURLConnection *) connection didReceiveResponse: (NSURLResponse *) response
{
[fPortProbeData setLength: 0];
fPortProbeData.length = 0;
}
- (void) connection: (NSURLConnection *) connection didReceiveData: (NSData *) data
@ -81,7 +81,7 @@
- (void) connection: (NSURLConnection *) connection didFailWithError: (NSError *) error
{
NSLog(@"Unable to get port status: connection failed (%@)", [error localizedDescription]);
NSLog(@"Unable to get port status: connection failed (%@)", error.localizedDescription);
[self callBackWithStatus: PORT_STATUS_ERROR];
}

8
macosx/PredicateEditorRowTemplateAny.m
View File

@ -30,11 +30,11 @@
NSComparisonPredicate * predicate = (NSComparisonPredicate *)[super predicateWithSubpredicates: subpredicates];
//construct a near-identical predicate
return [NSComparisonPredicate predicateWithLeftExpression: [predicate leftExpression]
rightExpression: [predicate rightExpression]
return [NSComparisonPredicate predicateWithLeftExpression: predicate.leftExpression
rightExpression: predicate.rightExpression
modifier: NSAnyPredicateModifier
type: [predicate predicateOperatorType]
options: [predicate options]];
type: predicate.predicateOperatorType
options: predicate.options];
}
@end

4
macosx/PrefsController.h
View File

@ -67,7 +67,7 @@
NSString * fRPCPassword;
}
- (id) initWithHandle: (tr_session *) handle;
- (instancetype) initWithHandle: (tr_session *) handle;
- (void) setAutoUpdateToBeta: (id) sender;
@ -78,7 +78,7 @@
- (void) updatePortStatus;
- (void) portCheckerDidFinishProbing: (PortChecker *) portChecker;
- (NSArray *) sounds;
@property (nonatomic, readonly) NSArray *sounds;
- (void) setSound: (id) sender;
- (void) setUTP: (id) sender;

462
macosx/PrefsController.m
View File

File diff suppressed because it is too large Load Diff

2
macosx/PrefsWindow.m
View File

@ -34,7 +34,7 @@
- (void) keyDown: (NSEvent *) event
{
if ([event keyCode] == 53) //esc key
if (event.keyCode == 53) //esc key
[self close];
else
[super keyDown: event];

20
macosx/ProgressGradients.h
View File

@ -25,15 +25,15 @@
@interface ProgressGradients : NSObject
+ (NSGradient *) progressWhiteGradient;
+ (NSGradient *) progressGrayGradient;
+ (NSGradient *) progressLightGrayGradient;
+ (NSGradient *) progressBlueGradient;
+ (NSGradient *) progressDarkBlueGradient;
+ (NSGradient *) progressGreenGradient;
+ (NSGradient *) progressLightGreenGradient;
+ (NSGradient *) progressDarkGreenGradient;
+ (NSGradient *) progressRedGradient;
+ (NSGradient *) progressYellowGradient;
@property (nonatomic, class, readonly) NSGradient * progressWhiteGradient;
@property (nonatomic, class, readonly) NSGradient * progressGrayGradient;
@property (nonatomic, class, readonly) NSGradient * progressLightGrayGradient;
@property (nonatomic, class, readonly) NSGradient * progressBlueGradient;
@property (nonatomic, class, readonly) NSGradient * progressDarkBlueGradient;
@property (nonatomic, class, readonly) NSGradient * progressGreenGradient;
@property (nonatomic, class, readonly) NSGradient * progressLightGreenGradient;
@property (nonatomic, class, readonly) NSGradient * progressDarkGreenGradient;
@property (nonatomic, class, readonly) NSGradient * progressRedGradient;
@property (nonatomic, class, readonly) NSGradient * progressYellowGradient;
@end

2
macosx/ProgressGradients.m
View File

@ -27,7 +27,7 @@
+ (NSGradient *) progressGradientForRed: (CGFloat) redComponent green: (CGFloat) greenComponent blue: (CGFloat) blueComponent
{
const CGFloat alpha = [[NSUserDefaults standardUserDefaults] boolForKey: @"SmallView"] ? 0.27 : 1.0;
const CGFloat alpha = [NSUserDefaults.standardUserDefaults boolForKey: @"SmallView"] ? 0.27 : 1.0;
NSColor * baseColor = [NSColor colorWithCalibratedRed: redComponent green: greenComponent blue: blueComponent alpha: alpha];

10
macosx/ShareToolbarItem.m
View File

@ -14,17 +14,17 @@
- (NSMenuItem *) menuFormRepresentation
{
NSMenuItem * menuItem = [[NSMenuItem alloc] initWithTitle: [self label] action: nil keyEquivalent: @""];
[menuItem setEnabled: [[self target] validateToolbarItem: self]];
NSMenuItem * menuItem = [[NSMenuItem alloc] initWithTitle: self.label action: nil keyEquivalent: @""];
menuItem.enabled = [self.target validateToolbarItem: self];
if ([menuItem isEnabled]) {
if (menuItem.enabled) {
NSMenu *servicesMenu = [[NSMenu alloc] initWithTitle: @""];
for (NSMenuItem * item in [[ShareTorrentFileHelper sharedHelper] menuItems])
for (NSMenuItem * item in ShareTorrentFileHelper.sharedHelper.menuItems)
{
[servicesMenu addItem:item];
}
[menuItem setSubmenu:servicesMenu];
menuItem.submenu = servicesMenu;
}
return menuItem;

6
macosx/ShareTorrentFileHelper.h
View File

@ -10,9 +10,9 @@
@interface ShareTorrentFileHelper : NSObject
+ (ShareTorrentFileHelper *) sharedHelper;
@property (nonatomic, class, readonly) ShareTorrentFileHelper * sharedHelper;
- (NSArray *) shareTorrentURLs;
- (NSArray *) menuItems;
@property (nonatomic, readonly) NSArray *shareTorrentURLs;
@property (nonatomic, readonly) NSArray *menuItems;
@end

16
macosx/ShareTorrentFileHelper.m
View File

@ -24,12 +24,12 @@
- (NSArray *) shareTorrentURLs
{
NSArray * torrents = [(Controller *)[NSApp delegate] selectedTorrents];
NSMutableArray * fileURLs = [NSMutableArray arrayWithCapacity: [torrents count]];
NSArray * torrents = ((Controller *)NSApp.delegate).selectedTorrents;
NSMutableArray * fileURLs = [NSMutableArray arrayWithCapacity: torrents.count];
for (Torrent * torrent in torrents)
{
NSString * location = [torrent torrentLocation];
if ([location length] > 0) {
NSString * location = torrent.torrentLocation;
if (location.length > 0) {
[fileURLs addObject: [NSURL fileURLWithPath: location]];
}
}
@ -38,8 +38,8 @@
- (NSArray *) menuItems
{
NSArray * services = [NSSharingService sharingServicesForItems: [self shareTorrentURLs]];
NSMutableArray * items = [NSMutableArray arrayWithCapacity: [services count]];
NSArray * services = [NSSharingService sharingServicesForItems: self.shareTorrentURLs];
NSMutableArray * items = [NSMutableArray arrayWithCapacity: services.count];
for (NSSharingService * service in services)
{
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle: service.title // 10.9: change to menuItemTitle
@ -47,7 +47,7 @@
keyEquivalent: @""];
item.image = service.image;
item.representedObject = service;
service.delegate = (Controller *)[NSApp delegate];
service.delegate = (Controller *)NSApp.delegate;
item.target = self;
[items addObject: item];
}
@ -58,7 +58,7 @@
- (void) performShareAction: (NSMenuItem *) item
{
NSSharingService * service = item.representedObject;
[service performWithItems: [self shareTorrentURLs]]; // on 10.9, use attachmentFileURLs?
[service performWithItems: self.shareTorrentURLs]; // on 10.9, use attachmentFileURLs?
}
@end

2
macosx/StatsWindowController.h
View File

@ -33,7 +33,7 @@
NSTimer * fTimer;
}
+ (StatsWindowController *) statsWindow;
@property (nonatomic, class, readonly) StatsWindowController * statsWindow;
- (void) resetStats: (id) sender;

96
macosx/StatsWindowController.m
View File

@ -45,13 +45,13 @@ tr_session * fLib = NULL;
{
if ((fStatsWindowInstance = [[self alloc] init]))
{
fLib = [(Controller *)[NSApp delegate] sessionHandle];
fLib = ((Controller *)NSApp.delegate).sessionHandle;
}
}
return fStatsWindowInstance;
}
- (id) init
- (instancetype) init
{
return [super initWithWindowNibName: @"StatsWindow"];
}
@ -61,22 +61,22 @@ tr_session * fLib = NULL;
[self updateStats];
fTimer = [NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self selector: @selector(updateStats) userInfo: nil repeats: YES];
[[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSModalPanelRunLoopMode];
[[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSEventTrackingRunLoopMode];
[NSRunLoop.currentRunLoop addTimer: fTimer forMode: NSModalPanelRunLoopMode];
[NSRunLoop.currentRunLoop addTimer: fTimer forMode: NSEventTrackingRunLoopMode];
[[self window] setRestorationClass: [self class]];
self.window.restorationClass = [self class];
[[self window] setTitle: NSLocalizedString(@"Statistics", "Stats window -> title")];
self.window.title = NSLocalizedString(@"Statistics", "Stats window -> title");
//set label text
[fUploadedLabelField setStringValue: [NSLocalizedString(@"Uploaded", "Stats window -> label") stringByAppendingString: @":"]];
[fDownloadedLabelField setStringValue: [NSLocalizedString(@"Downloaded", "Stats window -> label") stringByAppendingString: @":"]];
[fRatioLabelField setStringValue: [NSLocalizedString(@"Ratio", "Stats window -> label") stringByAppendingString: @":"]];
[fTimeLabelField setStringValue: [NSLocalizedString(@"Running Time", "Stats window -> label") stringByAppendingString: @":"]];
[fNumOpenedLabelField setStringValue: [NSLocalizedString(@"Program Started", "Stats window -> label") stringByAppendingString: @":"]];
fUploadedLabelField.stringValue = [NSLocalizedString(@"Uploaded", "Stats window -> label") stringByAppendingString: @":"];
fDownloadedLabelField.stringValue = [NSLocalizedString(@"Downloaded", "Stats window -> label") stringByAppendingString: @":"];
fRatioLabelField.stringValue = [NSLocalizedString(@"Ratio", "Stats window -> label") stringByAppendingString: @":"];
fTimeLabelField.stringValue = [NSLocalizedString(@"Running Time", "Stats window -> label") stringByAppendingString: @":"];
fNumOpenedLabelField.stringValue = [NSLocalizedString(@"Program Started", "Stats window -> label") stringByAppendingString: @":"];
//size of all labels
const CGFloat oldWidth = [fUploadedLabelField frame].size.width;
const CGFloat oldWidth = fUploadedLabelField.frame.size.width;
NSArray * labels = @[fUploadedLabelField, fDownloadedLabelField, fRatioLabelField, fTimeLabelField, fNumOpenedLabelField];
@ -85,32 +85,32 @@ tr_session * fLib = NULL;
{
[label sizeToFit];
const CGFloat width = [label frame].size.width;
const CGFloat width = label.frame.size.width;
maxWidth = MAX(maxWidth, width);
}
for (NSTextField * label in labels)
{
NSRect frame = [label frame];
NSRect frame = label.frame;
frame.size.width = maxWidth;
[label setFrame: frame];
label.frame = frame;
}
//resize window for new label width - fields are set in nib to adjust correctly
NSRect windowRect = [[self window] frame];
NSRect windowRect = self.window.frame;
windowRect.size.width += maxWidth - oldWidth;
[[self window] setFrame: windowRect display: YES];
[self.window setFrame: windowRect display: YES];
//resize reset button
const CGFloat oldButtonWidth = [fResetButton frame].size.width;
const CGFloat oldButtonWidth = fResetButton.frame.size.width;
[fResetButton setTitle: NSLocalizedString(@"Reset", "Stats window -> reset button")];
fResetButton.title = NSLocalizedString(@"Reset", "Stats window -> reset button");
[fResetButton sizeToFit];
NSRect buttonFrame = [fResetButton frame];
NSRect buttonFrame = fResetButton.frame;
buttonFrame.size.width += 10.0;
buttonFrame.origin.x -= buttonFrame.size.width - oldButtonWidth;
[fResetButton setFrame: buttonFrame];
fResetButton.frame = buttonFrame;
}
- (void) windowWillClose: (id) sender
@ -124,31 +124,31 @@ tr_session * fLib = NULL;
{
NSAssert1([identifier isEqualToString: @"StatsWindow"], @"Trying to restore unexpected identifier %@", identifier);
completionHandler([[StatsWindowController statsWindow] window], nil);
completionHandler(StatsWindowController.statsWindow.window, nil);
}
- (void) resetStats: (id) sender
{
if (![[NSUserDefaults standardUserDefaults] boolForKey: @"WarningResetStats"])
if (![NSUserDefaults.standardUserDefaults boolForKey: @"WarningResetStats"])
{
[self performResetStats];
return;
}
NSAlert * alert = [[NSAlert alloc] init];
[alert setMessageText: NSLocalizedString(@"Are you sure you want to reset usage statistics?", "Stats reset -> title")];
[alert setInformativeText: NSLocalizedString(@"This will clear the global statistics displayed by Transmission."
" Individual transfer statistics will not be affected.", "Stats reset -> message")];
[alert setAlertStyle: NSWarningAlertStyle];
alert.messageText = NSLocalizedString(@"Are you sure you want to reset usage statistics?", "Stats reset -> title");
alert.informativeText = NSLocalizedString(@"This will clear the global statistics displayed by Transmission."
" Individual transfer statistics will not be affected.", "Stats reset -> message");
alert.alertStyle = NSWarningAlertStyle;
[alert addButtonWithTitle: NSLocalizedString(@"Reset", "Stats reset -> button")];
[alert addButtonWithTitle: NSLocalizedString(@"Cancel", "Stats reset -> button")];
[alert setShowsSuppressionButton: YES];
alert.showsSuppressionButton = YES;
[alert beginSheetModalForWindow:[self window] completionHandler:^(NSModalResponse returnCode) {
[[alert window] orderOut: nil];
[alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
[alert.window orderOut: nil];
if ([[alert suppressionButton] state] == NSOnState)
[[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningResetStats"];
if (alert.suppressionButton.state == NSOnState)
[NSUserDefaults.standardUserDefaults setBool: NO forKey: @"WarningResetStats"];
if (returnCode == NSAlertFirstButtonReturn)
[self performResetStats];
@ -171,25 +171,25 @@ tr_session * fLib = NULL;
tr_sessionGetStats(fLib, &statsSession);
NSByteCountFormatter * byteFormatter = [[NSByteCountFormatter alloc] init];
[byteFormatter setAllowedUnits: NSByteCountFormatterUseBytes];
byteFormatter.allowedUnits = NSByteCountFormatterUseBytes;
[fUploadedField setStringValue: [NSString stringForFileSize: statsSession.uploadedBytes]];
[fUploadedField setToolTip: [byteFormatter stringFromByteCount: statsSession.uploadedBytes]];
[fUploadedAllField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ total", "stats total"), [NSString stringForFileSize: statsAll.uploadedBytes]]];
[fUploadedAllField setToolTip: [byteFormatter stringFromByteCount: statsAll.uploadedBytes]];
fUploadedField.stringValue = [NSString stringForFileSize: statsSession.uploadedBytes];
fUploadedField.toolTip = [byteFormatter stringFromByteCount: statsSession.uploadedBytes];
fUploadedAllField.stringValue = [NSString stringWithFormat: NSLocalizedString(@"%@ total", "stats total"), [NSString stringForFileSize: statsAll.uploadedBytes]];
fUploadedAllField.toolTip = [byteFormatter stringFromByteCount: statsAll.uploadedBytes];
[fDownloadedField setStringValue: [NSString stringForFileSize: statsSession.downloadedBytes]];
[fDownloadedField setToolTip: [byteFormatter stringFromByteCount: statsSession.downloadedBytes]];
[fDownloadedAllField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ total", "stats total"), [NSString stringForFileSize: statsAll.downloadedBytes]]];
[fDownloadedAllField setToolTip: [byteFormatter stringFromByteCount: statsAll.downloadedBytes]];
fDownloadedField.stringValue = [NSString stringForFileSize: statsSession.downloadedBytes];
fDownloadedField.toolTip = [byteFormatter stringFromByteCount: statsSession.downloadedBytes];
fDownloadedAllField.stringValue = [NSString stringWithFormat: NSLocalizedString(@"%@ total", "stats total"), [NSString stringForFileSize: statsAll.downloadedBytes]];
fDownloadedAllField.toolTip = [byteFormatter stringFromByteCount: statsAll.downloadedBytes];
[fRatioField setStringValue: [NSString stringForRatio: statsSession.ratio]];
fRatioField.stringValue = [NSString stringForRatio: statsSession.ratio];
NSString * totalRatioString = statsAll.ratio != TR_RATIO_NA
? [NSString stringWithFormat: NSLocalizedString(@"%@ total", "stats total"), [NSString stringForRatio: statsAll.ratio]]
: NSLocalizedString(@"Total N/A", "stats total");
[fRatioAllField setStringValue: totalRatioString];
: NSLocalizedString(@"Total N/A", "stats total");
fRatioAllField.stringValue = totalRatioString;
static NSDateComponentsFormatter *timeFormatter;
static dispatch_once_t onceToken;
@ -200,13 +200,13 @@ tr_session * fLib = NULL;
timeFormatter.allowedUnits = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekOfMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute;
});
[fTimeField setStringValue: [timeFormatter stringFromTimeInterval:statsSession.secondsActive]];
[fTimeAllField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ total", "stats total"), [timeFormatter stringFromTimeInterval:statsAll.secondsActive]]];
fTimeField.stringValue = [timeFormatter stringFromTimeInterval:statsSession.secondsActive];
fTimeAllField.stringValue = [NSString stringWithFormat: NSLocalizedString(@"%@ total", "stats total"), [timeFormatter stringFromTimeInterval:statsAll.secondsActive]];
if (statsAll.sessionCount == 1)
[fNumOpenedField setStringValue: NSLocalizedString(@"1 time", "stats window -> times opened")];
fNumOpenedField.stringValue = NSLocalizedString(@"1 time", "stats window -> times opened");
else
[fNumOpenedField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ times", "stats window -> times opened"), [NSString formattedUInteger: statsAll.sessionCount]]];
fNumOpenedField.stringValue = [NSString stringWithFormat: NSLocalizedString(@"%@ times", "stats window -> times opened"), [NSString formattedUInteger: statsAll.sessionCount]];
}
- (void) performResetStats

2
macosx/StatusBarController.h
View File

@ -35,7 +35,7 @@
CGFloat fPreviousDownloadRate, fPreviousUploadRate;
}
- (id) initWithLib: (tr_session *) lib;
- (instancetype) initWithLib: (tr_session *) lib;
- (void) updateWithDownload: (CGFloat) dlRate upload: (CGFloat) ulRate;
- (void) setStatusLabel: (id) sender;

89
macosx/StatusBarController.m
View File

@ -30,13 +30,12 @@
#define STATUS_TRANSFER_TOTAL @"TransferTotal"
#define STATUS_TRANSFER_SESSION @"TransferSession"
typedef enum
{
typedef NS_ENUM(unsigned int, statusTag) {
STATUS_RATIO_TOTAL_TAG = 0,
STATUS_RATIO_SESSION_TAG = 1,
STATUS_TRANSFER_TOTAL_TAG = 2,
STATUS_TRANSFER_SESSION_TAG = 3
} statusTag;
};
@interface StatusBarController (Private)
@ -46,7 +45,7 @@ typedef enum
@implementation StatusBarController
- (id) initWithLib: (tr_session *) lib
- (instancetype) initWithLib: (tr_session *) lib
{
if ((self = [super initWithNibName: @"StatusBar" bundle: nil]))
{
@ -62,33 +61,33 @@ typedef enum
- (void) awakeFromNib
{
//localize menu items
[[[fStatusButton menu] itemWithTag: STATUS_RATIO_TOTAL_TAG] setTitle: NSLocalizedString(@"Total Ratio",
"Status Bar -> status menu")];
[[[fStatusButton menu] itemWithTag: STATUS_RATIO_SESSION_TAG] setTitle: NSLocalizedString(@"Session Ratio",
"Status Bar -> status menu")];
[[[fStatusButton menu] itemWithTag: STATUS_TRANSFER_TOTAL_TAG] setTitle: NSLocalizedString(@"Total Transfer",
"Status Bar -> status menu")];
[[[fStatusButton menu] itemWithTag: STATUS_TRANSFER_SESSION_TAG] setTitle: NSLocalizedString(@"Session Transfer",
"Status Bar -> status menu")];
[fStatusButton.menu itemWithTag: STATUS_RATIO_TOTAL_TAG].title = NSLocalizedString(@"Total Ratio",
"Status Bar -> status menu");
[fStatusButton.menu itemWithTag: STATUS_RATIO_SESSION_TAG].title = NSLocalizedString(@"Session Ratio",
"Status Bar -> status menu");
[fStatusButton.menu itemWithTag: STATUS_TRANSFER_TOTAL_TAG].title = NSLocalizedString(@"Total Transfer",
"Status Bar -> status menu");
[fStatusButton.menu itemWithTag: STATUS_TRANSFER_SESSION_TAG].title = NSLocalizedString(@"Session Transfer",
"Status Bar -> status menu");
[[fStatusButton cell] setBackgroundStyle: NSBackgroundStyleRaised];
[[fTotalDLField cell] setBackgroundStyle: NSBackgroundStyleRaised];
[[fTotalULField cell] setBackgroundStyle: NSBackgroundStyleRaised];
[[fTotalDLImageView cell] setBackgroundStyle: NSBackgroundStyleRaised];
[[fTotalULImageView cell] setBackgroundStyle: NSBackgroundStyleRaised];
fStatusButton.cell.backgroundStyle = NSBackgroundStyleRaised;
fTotalDLField.cell.backgroundStyle = NSBackgroundStyleRaised;
fTotalULField.cell.backgroundStyle = NSBackgroundStyleRaised;
fTotalDLImageView.cell.backgroundStyle = NSBackgroundStyleRaised;
fTotalULImageView.cell.backgroundStyle = NSBackgroundStyleRaised;
[self updateSpeedFieldsToolTips];
//update when speed limits are changed
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateSpeedFieldsToolTips)
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(updateSpeedFieldsToolTips)
name: @"SpeedLimitUpdate" object: nil];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(resizeStatusButton)
name: NSWindowDidResizeNotification object: [[self view] window]];
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(resizeStatusButton)
name: NSWindowDidResizeNotification object: self.view.window];
}
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[NSNotificationCenter.defaultCenter removeObserver: self];
}
- (void) updateWithDownload: (CGFloat) dlRate upload: (CGFloat) ulRate
@ -96,18 +95,18 @@ typedef enum
//set rates
if (dlRate != fPreviousDownloadRate)
{
[fTotalDLField setStringValue: [NSString stringForSpeed: dlRate]];
fTotalDLField.stringValue = [NSString stringForSpeed: dlRate];
fPreviousDownloadRate = dlRate;
}
if (ulRate != fPreviousUploadRate)
{
[fTotalULField setStringValue: [NSString stringForSpeed: ulRate]];
fTotalULField.stringValue = [NSString stringForSpeed: ulRate];
fPreviousUploadRate = ulRate;
}
//set status button text
NSString * statusLabel = [[NSUserDefaults standardUserDefaults] stringForKey: @"StatusLabel"], * statusString;
NSString * statusLabel = [NSUserDefaults.standardUserDefaults stringForKey: @"StatusLabel"], * statusString;
BOOL total;
if ((total = [statusLabel isEqualToString: STATUS_RATIO_TOTAL]) || [statusLabel isEqualToString: STATUS_RATIO_SESSION])
{
@ -136,9 +135,9 @@ typedef enum
}
if (![[fStatusButton title] isEqualToString: statusString])
if (![fStatusButton.title isEqualToString: statusString])
{
[fStatusButton setTitle: statusString];
fStatusButton.title = statusString;
[self resizeStatusButton];
}
}
@ -165,36 +164,36 @@ typedef enum
return;
}
[[NSUserDefaults standardUserDefaults] setObject: statusLabel forKey: @"StatusLabel"];
[NSUserDefaults.standardUserDefaults setObject: statusLabel forKey: @"StatusLabel"];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateUI" object: nil];
}
- (void) updateSpeedFieldsToolTips
{
NSString * uploadText, * downloadText;
if ([[NSUserDefaults standardUserDefaults] boolForKey: @"SpeedLimit"])
if ([NSUserDefaults.standardUserDefaults boolForKey: @"SpeedLimit"])
{
NSString * speedString = [NSString stringWithFormat: @"%@ (%@)", NSLocalizedString(@"%d KB/s", "Status Bar -> speed tooltip"),
NSLocalizedString(@"Speed Limit", "Status Bar -> speed tooltip")];
uploadText = [NSString stringWithFormat: speedString,
[[NSUserDefaults standardUserDefaults] integerForKey: @"SpeedLimitUploadLimit"]];
[NSUserDefaults.standardUserDefaults integerForKey: @"SpeedLimitUploadLimit"]];
downloadText = [NSString stringWithFormat: speedString,
[[NSUserDefaults standardUserDefaults] integerForKey: @"SpeedLimitDownloadLimit"]];
[NSUserDefaults.standardUserDefaults integerForKey: @"SpeedLimitDownloadLimit"]];
}
else
{
if ([[NSUserDefaults standardUserDefaults] boolForKey: @"CheckUpload"])
if ([NSUserDefaults.standardUserDefaults boolForKey: @"CheckUpload"])
uploadText = [NSString stringWithFormat: NSLocalizedString(@"%d KB/s", "Status Bar -> speed tooltip"),
[[NSUserDefaults standardUserDefaults] integerForKey: @"UploadLimit"]];
[NSUserDefaults.standardUserDefaults integerForKey: @"UploadLimit"]];
else
uploadText = NSLocalizedString(@"unlimited", "Status Bar -> speed tooltip");
if ([[NSUserDefaults standardUserDefaults] boolForKey: @"CheckDownload"])
if ([NSUserDefaults.standardUserDefaults boolForKey: @"CheckDownload"])
downloadText = [NSString stringWithFormat: NSLocalizedString(@"%d KB/s", "Status Bar -> speed tooltip"),
[[NSUserDefaults standardUserDefaults] integerForKey: @"DownloadLimit"]];
[NSUserDefaults.standardUserDefaults integerForKey: @"DownloadLimit"]];
else
downloadText = NSLocalizedString(@"unlimited", "Status Bar -> speed tooltip");
}
@ -204,19 +203,19 @@ typedef enum
downloadText = [NSLocalizedString(@"Global download limit", "Status Bar -> speed tooltip")
stringByAppendingFormat: @": %@", downloadText];
[fTotalULField setToolTip: uploadText];
[fTotalDLField setToolTip: downloadText];
fTotalULField.toolTip = uploadText;
fTotalDLField.toolTip = downloadText;
}
- (BOOL) validateMenuItem: (NSMenuItem *) menuItem
{
const SEL action = [menuItem action];
const SEL action = menuItem.action;
//enable sort options
if (action == @selector(setStatusLabel:))
{
NSString * statusLabel;
switch ([menuItem tag])
switch (menuItem.tag)
{
case STATUS_RATIO_TOTAL_TAG:
statusLabel = STATUS_RATIO_TOTAL;
@ -231,12 +230,12 @@ typedef enum
statusLabel = STATUS_TRANSFER_SESSION;
break;
default:
NSAssert1(NO, @"Unknown status label tag received: %ld", [menuItem tag]);
NSAssert1(NO, @"Unknown status label tag received: %ld", menuItem.tag);
statusLabel = STATUS_RATIO_TOTAL;
}
[menuItem setState: [statusLabel isEqualToString: [[NSUserDefaults standardUserDefaults] stringForKey: @"StatusLabel"]]
? NSOnState : NSOffState];
menuItem.state = [statusLabel isEqualToString: [NSUserDefaults.standardUserDefaults stringForKey: @"StatusLabel"]]
? NSOnState : NSOffState;
return YES;
}
@ -252,14 +251,14 @@ typedef enum
[fStatusButton sizeToFit];
//width ends up being too long
NSRect statusFrame = [fStatusButton frame];
NSRect statusFrame = fStatusButton.frame;
statusFrame.size.width -= 25.0;
const CGFloat difference = NSMaxX(statusFrame) + 5.0 - NSMinX([fTotalDLImageView frame]);
const CGFloat difference = NSMaxX(statusFrame) + 5.0 - NSMinX(fTotalDLImageView.frame);
if (difference > 0.0)
statusFrame.size.width -= difference;
[fStatusButton setFrame: statusFrame];
fStatusButton.frame = statusFrame;
}
@end

6
macosx/StatusBarView.m
View File

@ -43,13 +43,13 @@
- (void) drawRect: (NSRect) rect
{
[[NSColor windowBackgroundColor] setFill];
[NSColor.windowBackgroundColor setFill];
NSRectFill(rect);
const NSRect lineBorderRect = NSMakeRect(NSMinX(rect), 0.0, NSWidth(rect), 1.0);
if (NSIntersectsRect(lineBorderRect, rect))
{
[[NSColor gridColor] setFill];
[NSColor.gridColor setFill];
NSRectFill(lineBorderRect);
}
}
@ -60,7 +60,7 @@
- (void) reload
{
[self setNeedsDisplay: YES];
self.needsDisplay = YES;
}
@end

206
macosx/Torrent.h
View File

@ -27,32 +27,32 @@
@class FileListNode;
typedef enum {
typedef NS_ENUM(unsigned int, TorrentDeterminationType) {
TorrentDeterminationAutomatic = 0,
TorrentDeterminationUserSpecified
} TorrentDeterminationType;
};
#define kTorrentDidChangeGroupNotification @"TorrentDidChangeGroup"
@interface Torrent : NSObject <NSCopying, QLPreviewItem>
- (id) initWithPath: (NSString *) path location: (NSString *) location deleteTorrentFile: (BOOL) torrentDelete
lib: (tr_session *) lib;
- (id) initWithTorrentStruct: (tr_torrent *) torrentStruct location: (NSString *) location lib: (tr_session *) lib;
- (id) initWithMagnetAddress: (NSString *) address location: (NSString *) location lib: (tr_session *) lib;
- (id) initWithHistory: (NSDictionary *) history lib: (tr_session *) lib forcePause: (BOOL) pause;
- (NSDictionary *) history;
- (instancetype) initWithPath: (NSString *) path location: (NSString *) location deleteTorrentFile: (BOOL) torrentDelete
lib: (tr_session *) lib;
- (instancetype) initWithTorrentStruct: (tr_torrent *) torrentStruct location: (NSString *) location lib: (tr_session *) lib;
- (instancetype) initWithMagnetAddress: (NSString *) address location: (NSString *) location lib: (tr_session *) lib;
- (instancetype) initWithHistory: (NSDictionary *) history lib: (tr_session *) lib forcePause: (BOOL) pause;
@property (nonatomic, readonly) NSDictionary *history;
- (void) closeRemoveTorrent: (BOOL) trashFiles;
- (void) changeDownloadFolderBeforeUsing: (NSString *) folder determinationType: (TorrentDeterminationType) determinationType;
- (NSString *) currentDirectory;
@property (nonatomic, readonly) NSString *currentDirectory;
- (void) getAvailability: (int8_t *) tab size: (NSInteger) size;
- (void) getAmountFinished: (float *) tab size: (NSInteger) size;
- (NSIndexSet *) previousFinishedPieces;
- (void) setPreviousFinishedPieces: (NSIndexSet *) indexes;
@property (nonatomic) NSIndexSet *previousFinishedPieces;
- (void) update;
@ -63,45 +63,37 @@ typedef enum {
- (void) sleep;
- (void) wakeUp;
- (NSInteger) queuePosition;
- (void) setQueuePosition: (NSUInteger) index;
@property (nonatomic) NSUInteger queuePosition;
- (void) manualAnnounce;
- (BOOL) canManualAnnounce;
@property (nonatomic, readonly) BOOL canManualAnnounce;
- (void) resetCache;
- (BOOL) isMagnet;
- (NSString *) magnetLink;
@property (nonatomic, getter=isMagnet, readonly) BOOL magnet;
@property (nonatomic, readonly) NSString *magnetLink;
- (CGFloat) ratio;
- (tr_ratiolimit) ratioSetting;
- (void) setRatioSetting: (tr_ratiolimit) setting;
- (CGFloat) ratioLimit;
- (void) setRatioLimit: (CGFloat) limit;
- (CGFloat) progressStopRatio;
@property (nonatomic, readonly) CGFloat ratio;
@property (nonatomic) tr_ratiolimit ratioSetting;
@property (nonatomic) CGFloat ratioLimit;
@property (nonatomic, readonly) CGFloat progressStopRatio;
- (tr_idlelimit) idleSetting;
- (void) setIdleSetting: (tr_idlelimit) setting;
- (NSUInteger) idleLimitMinutes;
- (void) setIdleLimitMinutes: (NSUInteger) limit;
@property (nonatomic) tr_idlelimit idleSetting;
@property (nonatomic) NSUInteger idleLimitMinutes;
- (BOOL) usesSpeedLimit: (BOOL) upload;
- (void) setUseSpeedLimit: (BOOL) use upload: (BOOL) upload;
- (NSInteger) speedLimit: (BOOL) upload;
- (void) setSpeedLimit: (NSInteger) limit upload: (BOOL) upload;
- (BOOL) usesGlobalSpeedLimit;
- (void) setUseGlobalSpeedLimit: (BOOL) use;
@property (nonatomic) BOOL usesGlobalSpeedLimit;
- (void) setMaxPeerConnect: (uint16_t) count;
- (uint16_t) maxPeerConnect;
@property (nonatomic) uint16_t maxPeerConnect;
@property (nonatomic) BOOL removeWhenFinishSeeding;
- (BOOL) waitingToStart;
@property (nonatomic, readonly) BOOL waitingToStart;
- (tr_priority_t) priority;
- (void) setPriority: (tr_priority_t) priority;
@property (nonatomic) tr_priority_t priority;
+ (BOOL) trashFile: (NSString *) path error: (NSError **) error;
- (void) moveTorrentDataFileTo: (NSString *) folder;
@ -109,93 +101,93 @@ typedef enum {
- (BOOL) alertForRemainingDiskSpace;
- (NSImage *) icon;
@property (nonatomic, readonly) NSImage *icon;
- (NSString *) name;
- (BOOL) isFolder;
- (uint64_t) size;
- (uint64_t) sizeLeft;
@property (nonatomic, readonly) NSString *name;
@property (nonatomic, getter=isFolder, readonly) BOOL folder;
@property (nonatomic, readonly) uint64_t size;
@property (nonatomic, readonly) uint64_t sizeLeft;
- (NSMutableArray *) allTrackerStats;
- (NSArray *) allTrackersFlat; //used by GroupRules
@property (nonatomic, readonly) NSMutableArray *allTrackerStats;
@property (nonatomic, readonly) NSArray *allTrackersFlat; //used by GroupRules
- (BOOL) addTrackerToNewTier: (NSString *) tracker;
- (void) removeTrackers: (NSSet *) trackers;
- (NSString *) comment;
- (NSString *) creator;
- (NSDate *) dateCreated;
@property (nonatomic, readonly) NSString *comment;
@property (nonatomic, readonly) NSString *creator;
@property (nonatomic, readonly) NSDate *dateCreated;
- (NSInteger) pieceSize;
- (NSInteger) pieceCount;
- (NSString *) hashString;
- (BOOL) privateTorrent;
@property (nonatomic, readonly) NSInteger pieceSize;
@property (nonatomic, readonly) NSInteger pieceCount;
@property (nonatomic, readonly) NSString *hashString;
@property (nonatomic, readonly) BOOL privateTorrent;
- (NSString *) torrentLocation;
- (NSString *) dataLocation;
@property (nonatomic, readonly) NSString *torrentLocation;
@property (nonatomic, readonly) NSString *dataLocation;
- (NSString *) fileLocation: (FileListNode *) node;
- (void) renameTorrent: (NSString *) newName completionHandler: (void (^)(BOOL didRename)) completionHandler;
- (void) renameFileNode: (FileListNode *) node withName: (NSString *) newName completionHandler: (void (^)(BOOL didRename)) completionHandler;
- (CGFloat) progress;
- (CGFloat) progressDone;
- (CGFloat) progressLeft;
- (CGFloat) checkingProgress;
@property (nonatomic, readonly) CGFloat progress;
@property (nonatomic, readonly) CGFloat progressDone;
@property (nonatomic, readonly) CGFloat progressLeft;
@property (nonatomic, readonly) CGFloat checkingProgress;
- (CGFloat) availableDesired;
@property (nonatomic, readonly) CGFloat availableDesired;
- (BOOL) isActive;
- (BOOL) isSeeding;
- (BOOL) isChecking;
- (BOOL) isCheckingWaiting;
- (BOOL) allDownloaded;
- (BOOL) isComplete;
- (BOOL) isFinishedSeeding;
- (BOOL) isError;
- (BOOL) isAnyErrorOrWarning;
- (NSString *) errorMessage;
@property (nonatomic, getter=isActive, readonly) BOOL active;
@property (nonatomic, getter=isSeeding, readonly) BOOL seeding;
@property (nonatomic, getter=isChecking, readonly) BOOL checking;
@property (nonatomic, getter=isCheckingWaiting, readonly) BOOL checkingWaiting;
@property (nonatomic, readonly) BOOL allDownloaded;
@property (nonatomic, getter=isComplete, readonly) BOOL complete;
@property (nonatomic, getter=isFinishedSeeding, readonly) BOOL finishedSeeding;
@property (nonatomic, getter=isError, readonly) BOOL error;
@property (nonatomic, getter=isAnyErrorOrWarning, readonly) BOOL anyErrorOrWarning;
@property (nonatomic, readonly) NSString *errorMessage;
- (NSArray *) peers;
@property (nonatomic, readonly) NSArray *peers;
- (NSUInteger) webSeedCount;
- (NSArray *) webSeeds;
@property (nonatomic, readonly) NSUInteger webSeedCount;
@property (nonatomic, readonly) NSArray *webSeeds;
- (NSString *) progressString;
- (NSString *) statusString;
- (NSString *) shortStatusString;
- (NSString *) remainingTimeString;
@property (nonatomic, readonly) NSString *progressString;
@property (nonatomic, readonly) NSString *statusString;
@property (nonatomic, readonly) NSString *shortStatusString;
@property (nonatomic, readonly) NSString *remainingTimeString;
- (NSString *) stateString;
- (NSInteger) totalPeersConnected;
- (NSInteger) totalPeersTracker;
- (NSInteger) totalPeersIncoming;
- (NSInteger) totalPeersCache;
- (NSInteger) totalPeersPex;
- (NSInteger) totalPeersDHT;
- (NSInteger) totalPeersLocal;
- (NSInteger) totalPeersLTEP;
@property (nonatomic, readonly) NSString *stateString;
@property (nonatomic, readonly) NSInteger totalPeersConnected;
@property (nonatomic, readonly) NSInteger totalPeersTracker;
@property (nonatomic, readonly) NSInteger totalPeersIncoming;
@property (nonatomic, readonly) NSInteger totalPeersCache;
@property (nonatomic, readonly) NSInteger totalPeersPex;
@property (nonatomic, readonly) NSInteger totalPeersDHT;
@property (nonatomic, readonly) NSInteger totalPeersLocal;
@property (nonatomic, readonly) NSInteger totalPeersLTEP;
- (NSInteger) peersSendingToUs;
- (NSInteger) peersGettingFromUs;
@property (nonatomic, readonly) NSInteger peersSendingToUs;
@property (nonatomic, readonly) NSInteger peersGettingFromUs;
- (CGFloat) downloadRate;
- (CGFloat) uploadRate;
- (CGFloat) totalRate;
- (uint64_t) haveVerified;
- (uint64_t) haveTotal;
- (uint64_t) totalSizeSelected;
- (uint64_t) downloadedTotal;
- (uint64_t) uploadedTotal;
- (uint64_t) failedHash;
@property (nonatomic, readonly) CGFloat downloadRate;
@property (nonatomic, readonly) CGFloat uploadRate;
@property (nonatomic, readonly) CGFloat totalRate;
@property (nonatomic, readonly) uint64_t haveVerified;
@property (nonatomic, readonly) uint64_t haveTotal;
@property (nonatomic, readonly) uint64_t totalSizeSelected;
@property (nonatomic, readonly) uint64_t downloadedTotal;
@property (nonatomic, readonly) uint64_t uploadedTotal;
@property (nonatomic, readonly) uint64_t failedHash;
- (NSInteger) groupValue;
@property (nonatomic, readonly) NSInteger groupValue;
- (void) setGroupValue: (NSInteger) groupValue determinationType: (TorrentDeterminationType) determinationType;;
- (NSInteger) groupOrderValue;
@property (nonatomic, readonly) NSInteger groupOrderValue;
- (void) checkGroupValueForRemoval: (NSNotification *) notification;
- (NSArray *) fileList;
- (NSArray *) flatFileList;
- (NSInteger) fileCount;
@property (nonatomic, readonly) NSArray *fileList;
@property (nonatomic, readonly) NSArray *flatFileList;
@property (nonatomic, readonly) NSInteger fileCount;
- (void) updateFileStat;
//methods require fileStats to have been updated recently to be accurate
@ -208,22 +200,22 @@ typedef enum {
- (BOOL) hasFilePriority: (tr_priority_t) priority forIndexes: (NSIndexSet *) indexSet;
- (NSSet *) filePrioritiesForIndexes: (NSIndexSet *) indexSet;
- (NSDate *) dateAdded;
- (NSDate *) dateCompleted;
- (NSDate *) dateActivity;
- (NSDate *) dateActivityOrAdd;
@property (nonatomic, readonly) NSDate *dateAdded;
@property (nonatomic, readonly) NSDate *dateCompleted;
@property (nonatomic, readonly) NSDate *dateActivity;
@property (nonatomic, readonly) NSDate *dateActivityOrAdd;
- (NSInteger) secondsDownloading;
- (NSInteger) secondsSeeding;
@property (nonatomic, readonly) NSInteger secondsDownloading;
@property (nonatomic, readonly) NSInteger secondsSeeding;
- (NSInteger) stalledMinutes;
- (BOOL) isStalled;
@property (nonatomic, readonly) NSInteger stalledMinutes;
@property (nonatomic, getter=isStalled, readonly) BOOL stalled;
- (void) updateTimeMachineExclude;
- (NSInteger) stateSortKey;
- (NSString *) trackerSortKey;
@property (nonatomic, readonly) NSInteger stateSortKey;
@property (nonatomic, readonly) NSString *trackerSortKey;
- (tr_torrent *) torrentStruct;
@property (nonatomic, readonly) tr_torrent *torrentStruct;
@end

430
macosx/Torrent.m
View File

File diff suppressed because it is too large Load Diff

199
macosx/TorrentCell.m
View File

@ -78,26 +78,26 @@
- (NSRect) revealButtonRectForBounds: (NSRect) bounds;
- (NSRect) actionButtonRectForBounds: (NSRect) bounds;
- (NSAttributedString *) attributedTitle;
@property (nonatomic, readonly) NSAttributedString *attributedTitle;
- (NSAttributedString *) attributedStatusString: (NSString *) string;
- (NSString *) buttonString;
- (NSString *) statusString;
- (NSString *) minimalStatusString;
@property (nonatomic, readonly) NSString *buttonString;
@property (nonatomic, readonly) NSString *statusString;
@property (nonatomic, readonly) NSString *minimalStatusString;
@end
@implementation TorrentCell
//only called once and the main table is always needed, so don't worry about releasing
- (id) init
- (instancetype) init
{
if ((self = [super init]))
{
fDefaults = [NSUserDefaults standardUserDefaults];
fDefaults = NSUserDefaults.standardUserDefaults;
NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
[paragraphStyle setLineBreakMode: NSLineBreakByTruncatingMiddle];
NSMutableParagraphStyle * paragraphStyle = [NSParagraphStyle.defaultParagraphStyle mutableCopy];
paragraphStyle.lineBreakMode = NSLineBreakByTruncatingMiddle;
fTitleAttributes = [[NSMutableDictionary alloc] initWithCapacity: 3];
fTitleAttributes[NSFontAttributeName] = [NSFont messageFontOfSize: 12.0];
@ -118,7 +118,7 @@
- (id) copyWithZone: (NSZone *) zone
{
id value = [super copyWithZone: zone];
[value setRepresentedObject: [self representedObject]];
[value setRepresentedObject: self.representedObject];
return value;
}
@ -132,10 +132,10 @@
- (NSCellHitResult) hitTestForEvent: (NSEvent *) event inRect: (NSRect) cellFrame ofView: (NSView *) controlView
{
NSPoint point = [controlView convertPoint: [event locationInWindow] fromView: nil];
NSPoint point = [controlView convertPoint: event.locationInWindow fromView: nil];
if (NSMouseInRect(point, [self controlButtonRectForBounds: cellFrame], [controlView isFlipped])
|| NSMouseInRect(point, [self revealButtonRectForBounds: cellFrame], [controlView isFlipped]))
if (NSMouseInRect(point, [self controlButtonRectForBounds: cellFrame], controlView.flipped)
|| NSMouseInRect(point, [self revealButtonRectForBounds: cellFrame], controlView.flipped))
return NSCellHitContentArea | NSCellHitTrackableArea;
return NSCellHitContentArea;
@ -150,25 +150,25 @@
{
fTracking = YES;
[self setControlView: controlView];
self.controlView = controlView;
NSPoint point = [controlView convertPoint: [event locationInWindow] fromView: nil];
NSPoint point = [controlView convertPoint: event.locationInWindow fromView: nil];
const NSRect controlRect = [self controlButtonRectForBounds: cellFrame];
const BOOL checkControl = NSMouseInRect(point, controlRect, [controlView isFlipped]);
const BOOL checkControl = NSMouseInRect(point, controlRect, controlView.flipped);
const NSRect revealRect = [self revealButtonRectForBounds: cellFrame];
const BOOL checkReveal = NSMouseInRect(point, revealRect, [controlView isFlipped]);
const BOOL checkReveal = NSMouseInRect(point, revealRect, controlView.flipped);
[(TorrentTableView *)controlView removeTrackingAreas];
while ([event type] != NSLeftMouseUp)
while (event.type != NSLeftMouseUp)
{
point = [controlView convertPoint: [event locationInWindow] fromView: nil];
point = [controlView convertPoint: event.locationInWindow fromView: nil];
if (checkControl)
{
const BOOL inControlButton = NSMouseInRect(point, controlRect, [controlView isFlipped]);
const BOOL inControlButton = NSMouseInRect(point, controlRect, controlView.flipped);
if (fMouseDownControlButton != inControlButton)
{
fMouseDownControlButton = inControlButton;
@ -177,7 +177,7 @@
}
else if (checkReveal)
{
const BOOL inRevealButton = NSMouseInRect(point, revealRect, [controlView isFlipped]);
const BOOL inRevealButton = NSMouseInRect(point, revealRect, controlView.flipped);
if (fMouseDownRevealButton != inRevealButton)
{
fMouseDownRevealButton = inRevealButton;
@ -187,9 +187,9 @@
else;
//send events to where necessary
if ([event type] == NSMouseEntered || [event type] == NSMouseExited)
if (event.type == NSMouseEntered || event.type == NSMouseExited)
[NSApp sendEvent: event];
event = [[controlView window] nextEventMatchingMask:
event = [controlView.window nextEventMatchingMask:
(NSLeftMouseUpMask | NSLeftMouseDraggedMask | NSMouseEnteredMask | NSMouseExitedMask)];
}
@ -199,18 +199,18 @@
{
fMouseDownControlButton = NO;
[(TorrentTableView *)controlView toggleControlForTorrent: [self representedObject]];
[(TorrentTableView *)controlView toggleControlForTorrent: self.representedObject];
}
else if (fMouseDownRevealButton)
{
fMouseDownRevealButton = NO;
[controlView setNeedsDisplayInRect: cellFrame];
NSString * location = [[self representedObject] dataLocation];
NSString * location = ((Torrent *)self.representedObject).dataLocation;
if (location)
{
NSURL * file = [NSURL fileURLWithPath: location];
[[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs: @[file]];
[NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs: @[file]];
}
}
else;
@ -229,7 +229,7 @@
if ([fDefaults boolForKey: @"SmallView"])
{
NSTrackingAreaOptions rowOptions = options;
if (NSMouseInRect(mouseLocation, cellFrame, [controlView isFlipped]))
if (NSMouseInRect(mouseLocation, cellFrame, controlView.flipped))
{
rowOptions |= NSTrackingAssumeInside;
[(TorrentTableView *)controlView setRowHover: [userInfo[@"Row"] integerValue]];
@ -244,7 +244,7 @@
//control button
NSRect controlButtonRect = [self controlButtonRectForBounds: cellFrame];
NSTrackingAreaOptions controlOptions = options;
if (NSMouseInRect(mouseLocation, controlButtonRect, [controlView isFlipped]))
if (NSMouseInRect(mouseLocation, controlButtonRect, controlView.flipped))
{
controlOptions |= NSTrackingAssumeInside;
[(TorrentTableView *)controlView setControlButtonHover: [userInfo[@"Row"] integerValue]];
@ -259,7 +259,7 @@
//reveal button
NSRect revealButtonRect = [self revealButtonRectForBounds: cellFrame];
NSTrackingAreaOptions revealOptions = options;
if (NSMouseInRect(mouseLocation, revealButtonRect, [controlView isFlipped]))
if (NSMouseInRect(mouseLocation, revealButtonRect, controlView.flipped))
{
revealOptions |= NSTrackingAssumeInside;
[(TorrentTableView *)controlView setRevealButtonHover: [userInfo[@"Row"] integerValue]];
@ -274,7 +274,7 @@
//action button
NSRect actionButtonRect = [self iconRectForBounds: cellFrame]; //use the whole icon
NSTrackingAreaOptions actionOptions = options;
if (NSMouseInRect(mouseLocation, actionButtonRect, [controlView isFlipped]))
if (NSMouseInRect(mouseLocation, actionButtonRect, controlView.flipped))
{
actionOptions |= NSTrackingAssumeInside;
[(TorrentTableView *)controlView setActionButtonHover: [userInfo[@"Row"] integerValue]];
@ -313,7 +313,7 @@
- (void) drawInteriorWithFrame: (NSRect) cellFrame inView: (NSView *) controlView
{
Torrent * torrent = [self representedObject];
Torrent * torrent = self.representedObject;
NSAssert(torrent != nil, @"can't have a TorrentCell without a Torrent");
const BOOL minimal = [fDefaults boolForKey: @"SmallView"];
@ -324,7 +324,7 @@
//group coloring
const NSRect iconRect = [self iconRectForBounds: cellFrame];
const NSInteger groupValue = [torrent groupValue];
const NSInteger groupValue = torrent.groupValue;
if (groupValue != -1)
{
NSRect groupRect = NSInsetRect(iconRect, -1.0, -2.0);
@ -335,29 +335,29 @@
}
const CGFloat radius = minimal ? 3.0 : 6.0;
NSColor * groupColor = [[GroupsController groups] colorForIndex: groupValue],
* darkGroupColor = [groupColor blendedColorWithFraction: 0.2 ofColor: [NSColor whiteColor]];
NSColor * groupColor = [GroupsController.groups colorForIndex: groupValue],
* darkGroupColor = [groupColor blendedColorWithFraction: 0.2 ofColor: NSColor.whiteColor];
//border
NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: groupRect xRadius: radius yRadius: radius];
[darkGroupColor set];
[bp setLineWidth: 2.0];
bp.lineWidth = 2.0;
[bp stroke];
//inside
bp = [NSBezierPath bezierPathWithRoundedRect: groupRect xRadius: radius yRadius: radius];
NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: [groupColor blendedColorWithFraction: 0.7
ofColor: [NSColor whiteColor]] endingColor: darkGroupColor];
ofColor: NSColor.whiteColor] endingColor: darkGroupColor];
[gradient drawInBezierPath: bp angle: 90.0];
}
const BOOL error = [torrent isAnyErrorOrWarning];
const BOOL error = torrent.anyErrorOrWarning;
//icon
if (!minimal || !(!fTracking && fHoverAction)) //don't show in minimal mode when hovered over
{
NSImage * icon = (minimal && error) ? [NSImage imageNamed: NSImageNameCaution]
: [torrent icon];
: torrent.icon;
[icon drawInRect: iconRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];
}
@ -371,12 +371,12 @@
//text color
NSColor * titleColor, * statusColor;
if ([self backgroundStyle] == NSBackgroundStyleDark)
titleColor = statusColor = [NSColor whiteColor];
if (self.backgroundStyle == NSBackgroundStyleDark)
titleColor = statusColor = NSColor.whiteColor;
else
{
titleColor = [NSColor labelColor];
statusColor = [NSColor secondaryLabelColor];
titleColor = NSColor.labelColor;
statusColor = NSColor.secondaryLabelColor;
}
fTitleAttributes[NSForegroundColorAttributeName] = titleColor;
@ -386,7 +386,7 @@
CGFloat minimalTitleRightBound;
if (minimal)
{
NSAttributedString * minimalString = [self attributedStatusString: [self minimalStatusString]];
NSAttributedString * minimalString = [self attributedStatusString: self.minimalStatusString];
NSRect minimalStatusRect = [self rectForMinimalStatusWithString: minimalString inBounds: cellFrame];
if (!fHover)
@ -398,7 +398,7 @@
//progress
if (!minimal)
{
NSAttributedString * progressString = [self attributedStatusString: [torrent progressString]];
NSAttributedString * progressString = [self attributedStatusString: torrent.progressString];
NSRect progressRect = [self rectForProgressWithStringInBounds: cellFrame];
[progressString drawInRect: progressRect];
@ -416,13 +416,13 @@
controlImageSuffix = @"Off";
NSImage * controlImage;
if ([torrent isActive])
if (torrent.active)
controlImage = [NSImage imageNamed: [@"Pause" stringByAppendingString: controlImageSuffix]];
else
{
if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask)
if (NSApp.currentEvent.modifierFlags & NSAlternateKeyMask)
controlImage = [NSImage imageNamed: [@"ResumeNoWait" stringByAppendingString: controlImageSuffix]];
else if ([torrent waitingToStart])
else if (torrent.waitingToStart)
controlImage = [NSImage imageNamed: [@"Pause" stringByAppendingString: controlImageSuffix]];
else
controlImage = [NSImage imageNamed: [@"Resume" stringByAppendingString: controlImageSuffix]];
@ -463,26 +463,27 @@
}
//title
NSAttributedString * titleString = [self attributedTitle];
NSAttributedString * titleString = self.attributedTitle;
NSRect titleRect = [self rectForTitleWithString: titleString withRightBound: minimalTitleRightBound inBounds: cellFrame];
[titleString drawInRect: titleRect];
//priority icon
if ([torrent priority] != TR_PRI_NORMAL)
if (torrent.priority != TR_PRI_NORMAL)
{
const NSRect priorityRect = NSMakeRect(NSMaxX(titleRect) + PADDING_BETWEEN_TITLE_AND_PRIORITY,
NSMidY(titleRect) - PRIORITY_ICON_HEIGHT * 0.5,
PRIORITY_ICON_WIDTH, PRIORITY_ICON_HEIGHT);
NSColor * priorityColor = [self backgroundStyle] == NSBackgroundStyleDark ? [NSColor whiteColor] : [NSColor labelColor];
NSImage * priorityImage = [[NSImage imageNamed: ([torrent priority] == TR_PRI_HIGH ? @"PriorityHighTemplate" : @"PriorityLowTemplate")] imageWithColor: priorityColor];
NSColor * priorityColor = self.backgroundStyle == NSBackgroundStyleDark ? NSColor.whiteColor : NSColor.labelColor;
NSImage * priorityImage = [[NSImage imageNamed: (torrent.priority == TR_PRI_HIGH ? @"PriorityHighTemplate" : @"PriorityLowTemplate")] imageWithColor: priorityColor];
[priorityImage drawInRect: priorityRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];
}
//status
if (!minimal)
{
NSAttributedString * statusString = [self attributedStatusString: [self statusString]];
NSAttributedString * statusString = [self attributedStatusString: self.statusString];
[statusString drawInRect: [self rectForStatusWithStringInBounds: cellFrame]];
}
}
@ -495,7 +496,7 @@
CGFloat minimalTitleRightBound;
if (minimal)
{
NSAttributedString * minimalString = [self attributedStatusString: [self minimalStatusString]];
NSAttributedString * minimalString = [self attributedStatusString: self.minimalStatusString];
NSRect minimalStatusRect = [self rectForMinimalStatusWithString: minimalString inBounds: cellFrame];
minimalTitleRightBound = NSMinX(minimalStatusRect);
@ -507,13 +508,13 @@
minimalTitleRightBound = MIN(minimalTitleRightBound, NSMinX(controlRect));
}
NSAttributedString * titleString = [self attributedTitle];
NSAttributedString * titleString = self.attributedTitle;
NSRect realRect = [self rectForTitleWithString: titleString withRightBound: minimalTitleRightBound inBounds: cellFrame];
NSAssert([titleString size].width >= NSWidth(realRect), @"Full rect width should not be less than the used title rect width!");
if ([titleString size].width > NSWidth(realRect)
&& NSMouseInRect([view convertPoint: [[view window] mouseLocationOutsideOfEventStream] fromView: nil], realRect, [view isFlipped]))
&& NSMouseInRect([view convertPoint: view.window.mouseLocationOutsideOfEventStream fromView: nil], realRect, view.flipped))
{
realRect.size.width = [titleString size].width;
return NSInsetRect(realRect, -PADDING_EXPANSION_FRAME, -PADDING_EXPANSION_FRAME);
@ -527,8 +528,8 @@
cellFrame.origin.x += PADDING_EXPANSION_FRAME;
cellFrame.origin.y += PADDING_EXPANSION_FRAME;
fTitleAttributes[NSForegroundColorAttributeName] = [NSColor labelColor];
NSAttributedString * titleString = [self attributedTitle];
fTitleAttributes[NSForegroundColorAttributeName] = NSColor.labelColor;
NSAttributedString * titleString = self.attributedTitle;
[titleString drawInRect: cellFrame];
}
@ -540,7 +541,7 @@
{
const BOOL minimal = [fDefaults boolForKey: @"SmallView"];
const CGFloat piecesBarPercent = [(TorrentTableView *)[self controlView] piecesBarPercent];
const CGFloat piecesBarPercent = ((TorrentTableView *)self.controlView).piecesBarPercent;
if (piecesBarPercent > 0.0)
{
NSRect piecesBarRect, regularBarRect;
@ -552,7 +553,7 @@
}
else
{
[[self representedObject] setPreviousFinishedPieces: nil];
((Torrent *)self.representedObject).previousFinishedPieces = nil;
[self drawRegularBar: barRect];
}
@ -564,88 +565,88 @@
- (void) drawRegularBar: (NSRect) barRect
{
Torrent * torrent = [self representedObject];
Torrent * torrent = self.representedObject;
NSRect haveRect, missingRect;
NSDivideRect(barRect, &haveRect, &missingRect, round([torrent progress] * NSWidth(barRect)), NSMinXEdge);
NSDivideRect(barRect, &haveRect, &missingRect, round(torrent.progress * NSWidth(barRect)), NSMinXEdge);
if (!NSIsEmptyRect(haveRect))
{
if ([torrent isActive])
if (torrent.active)
{
if ([torrent isChecking])
[[ProgressGradients progressYellowGradient] drawInRect: haveRect angle: 90];
else if ([torrent isSeeding])
if (torrent.checking)
[ProgressGradients.progressYellowGradient drawInRect: haveRect angle: 90];
else if (torrent.seeding)
{
NSRect ratioHaveRect, ratioRemainingRect;
NSDivideRect(haveRect, &ratioHaveRect, &ratioRemainingRect, round([torrent progressStopRatio] * NSWidth(haveRect)),
NSDivideRect(haveRect, &ratioHaveRect, &ratioRemainingRect, round(torrent.progressStopRatio * NSWidth(haveRect)),
NSMinXEdge);
[[ProgressGradients progressGreenGradient] drawInRect: ratioHaveRect angle: 90];
[[ProgressGradients progressLightGreenGradient] drawInRect: ratioRemainingRect angle: 90];
[ProgressGradients.progressGreenGradient drawInRect: ratioHaveRect angle: 90];
[ProgressGradients.progressLightGreenGradient drawInRect: ratioRemainingRect angle: 90];
}
else
[[ProgressGradients progressBlueGradient] drawInRect: haveRect angle: 90];
[ProgressGradients.progressBlueGradient drawInRect: haveRect angle: 90];
}
else
{
if ([torrent waitingToStart])
if (torrent.waitingToStart)
{
if ([torrent allDownloaded])
[[ProgressGradients progressDarkGreenGradient] drawInRect: haveRect angle: 90];
if (torrent.allDownloaded)
[ProgressGradients.progressDarkGreenGradient drawInRect: haveRect angle: 90];
else
[[ProgressGradients progressDarkBlueGradient] drawInRect: haveRect angle: 90];
[ProgressGradients.progressDarkBlueGradient drawInRect: haveRect angle: 90];
}
else
[[ProgressGradients progressGrayGradient] drawInRect: haveRect angle: 90];
[ProgressGradients.progressGrayGradient drawInRect: haveRect angle: 90];
}
}
if (![torrent allDownloaded])
if (!torrent.allDownloaded)
{
const CGFloat widthRemaining = round(NSWidth(barRect) * [torrent progressLeft]);
const CGFloat widthRemaining = round(NSWidth(barRect) * torrent.progressLeft);
NSRect wantedRect;
NSDivideRect(missingRect, &wantedRect, &missingRect, widthRemaining, NSMinXEdge);
//not-available section
if ([torrent isActive] && ![torrent isChecking] && [torrent availableDesired] < 1.0
if (torrent.active && !torrent.checking && torrent.availableDesired < 1.0
&& [fDefaults boolForKey: @"DisplayProgressBarAvailable"])
{
NSRect unavailableRect;
NSDivideRect(wantedRect, &wantedRect, &unavailableRect, round(NSWidth(wantedRect) * [torrent availableDesired]),
NSDivideRect(wantedRect, &wantedRect, &unavailableRect, round(NSWidth(wantedRect) * torrent.availableDesired),
NSMinXEdge);
[[ProgressGradients progressRedGradient] drawInRect: unavailableRect angle: 90];
[ProgressGradients.progressRedGradient drawInRect: unavailableRect angle: 90];
}
//remaining section
[[ProgressGradients progressWhiteGradient] drawInRect: wantedRect angle: 90];
[ProgressGradients.progressWhiteGradient drawInRect: wantedRect angle: 90];
}
//unwanted section
if (!NSIsEmptyRect(missingRect))
{
if (![torrent isMagnet])
[[ProgressGradients progressLightGrayGradient] drawInRect: missingRect angle: 90];
if (!torrent.magnet)
[ProgressGradients.progressLightGrayGradient drawInRect: missingRect angle: 90];
else
[[ProgressGradients progressRedGradient] drawInRect: missingRect angle: 90];
[ProgressGradients.progressRedGradient drawInRect: missingRect angle: 90];
}
}
- (void) drawPiecesBar: (NSRect) barRect
{
Torrent * torrent = [self representedObject];
Torrent * torrent = self.representedObject;
//fill an all-white bar for magnet links
if ([torrent isMagnet])
if (torrent.magnet)
{
[[NSColor colorWithCalibratedWhite: 1.0 alpha: [fDefaults boolForKey: @"SmallView"] ? 0.25 : 1.0] set];
NSRectFillUsingOperation(barRect, NSCompositeSourceOver);
return;
}
NSInteger pieceCount = MIN([torrent pieceCount], MAX_PIECES);
NSInteger pieceCount = MIN(torrent.pieceCount, MAX_PIECES);
float * piecesPercent = malloc(pieceCount * sizeof(float));
[torrent getAmountFinished: piecesPercent size: pieceCount];
@ -653,7 +654,7 @@
pixelsWide: pieceCount pixelsHigh: 1 bitsPerSample: 8 samplesPerPixel: 4 hasAlpha: YES
isPlanar: NO colorSpaceName: NSCalibratedRGBColorSpace bytesPerRow: 0 bitsPerPixel: 0];
NSIndexSet * previousFinishedIndexes = [torrent previousFinishedPieces];
NSIndexSet * previousFinishedIndexes = torrent.previousFinishedPieces;
NSMutableIndexSet * finishedIndexes = [NSMutableIndexSet indexSet];
for (NSInteger i = 0; i < pieceCount; i++)
@ -662,13 +663,13 @@
if (piecesPercent[i] == 1.0f)
{
if (previousFinishedIndexes && ![previousFinishedIndexes containsIndex: i])
pieceColor = [NSColor orangeColor];
pieceColor = NSColor.orangeColor;
else
pieceColor = fBluePieceColor;
[finishedIndexes addIndex: i];
}
else
pieceColor = [[NSColor whiteColor] blendedColorWithFraction: piecesPercent[i] ofColor: fBluePieceColor];
pieceColor = [NSColor.whiteColor blendedColorWithFraction: piecesPercent[i] ofColor: fBluePieceColor];
//it's faster to just set color instead of checking previous color
[bitmap setColor: pieceColor atX: i y: 0];
@ -676,7 +677,7 @@
free(piecesPercent);
[torrent setPreviousFinishedPieces: [finishedIndexes count] > 0 ? finishedIndexes : nil]; //don't bother saving if none are complete
torrent.previousFinishedPieces = finishedIndexes.count > 0 ? finishedIndexes : nil; //don't bother saving if none are complete
//actually draw image
[bitmap drawInRect: barRect fromRect: NSZeroRect operation: NSCompositeSourceOver
@ -715,7 +716,7 @@
result.size.width = NSMaxX(bounds) - NSMinX(result) - PADDING_HORIZONTAL;
}
if ([(Torrent *)[self representedObject] priority] != TR_PRI_NORMAL)
if (((Torrent *)self.representedObject).priority != TR_PRI_NORMAL)
result.size.width -= PRIORITY_ICON_WIDTH + PADDING_BETWEEN_TITLE_AND_PRIORITY;
result.size.width = MIN(NSWidth(result), [string size].width);
@ -815,7 +816,7 @@
- (NSAttributedString *) attributedTitle
{
NSString * title = [(Torrent *)[self representedObject] name];
NSString * title = ((Torrent *)self.representedObject).name;
return [[NSAttributedString alloc] initWithString: title attributes: fTitleAttributes];
}
@ -830,14 +831,14 @@
return NSLocalizedString(@"Show the data file in Finder", "Torrent cell -> button info");
else if (fMouseDownControlButton || (!fTracking && fHoverControl))
{
Torrent * torrent = [self representedObject];
if ([torrent isActive])
Torrent * torrent = self.representedObject;
if (torrent.active)
return NSLocalizedString(@"Pause the transfer", "Torrent Table -> tooltip");
else
{
if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask)
if (NSApp.currentEvent.modifierFlags & NSAlternateKeyMask)
return NSLocalizedString(@"Resume the transfer right away", "Torrent cell -> button info");
else if ([torrent waitingToStart])
else if (torrent.waitingToStart)
return NSLocalizedString(@"Stop waiting to start", "Torrent cell -> button info");
else
return NSLocalizedString(@"Resume the transfer", "Torrent cell -> button info");
@ -852,16 +853,16 @@
- (NSString *) statusString
{
NSString * buttonString;
if ((buttonString = [self buttonString]))
if ((buttonString = self.buttonString))
return buttonString;
else
return [[self representedObject] statusString];
return ((Torrent *)self.representedObject).statusString;
}
- (NSString *) minimalStatusString
{
Torrent * torrent = [self representedObject];
return [fDefaults boolForKey: @"DisplaySmallStatusRegular"] ? [torrent shortStatusString] : [torrent remainingTimeString];
Torrent * torrent = self.representedObject;
return [fDefaults boolForKey: @"DisplaySmallStatusRegular"] ? torrent.shortStatusString : torrent.remainingTimeString;
}
@end

14
macosx/TorrentGroup.h
View File

@ -28,14 +28,14 @@
NSMutableArray * fTorrents;
}
- (id) initWithGroup: (NSInteger) group;
- (instancetype) initWithGroup: (NSInteger) group;
- (NSInteger) groupIndex;
- (NSInteger) groupOrderValue;
- (NSMutableArray *) torrents;
@property (nonatomic, readonly) NSInteger groupIndex;
@property (nonatomic, readonly) NSInteger groupOrderValue;
@property (nonatomic, readonly) NSMutableArray *torrents;
- (CGFloat) ratio;
- (CGFloat) uploadRate;
- (CGFloat) downloadRate;
@property (nonatomic, readonly) CGFloat ratio;
@property (nonatomic, readonly) CGFloat uploadRate;
@property (nonatomic, readonly) CGFloat downloadRate;
@end

12
macosx/TorrentGroup.m
View File

@ -29,7 +29,7 @@
@implementation TorrentGroup
- (id) initWithGroup: (NSInteger) group
- (instancetype) initWithGroup: (NSInteger) group
{
if ((self = [super init]))
{
@ -52,7 +52,7 @@
- (NSInteger) groupOrderValue
{
return [[GroupsController groups] rowValueForIndex: fGroup];
return [GroupsController.groups rowValueForIndex: fGroup];
}
- (NSMutableArray *) torrents
@ -65,8 +65,8 @@
uint64_t uploaded = 0, downloaded = 0;
for (Torrent * torrent in fTorrents)
{
uploaded += [torrent uploadedTotal];
downloaded += [torrent downloadedTotal];
uploaded += torrent.uploadedTotal;
downloaded += torrent.downloadedTotal;
}
return tr_getRatio(uploaded, downloaded);
@ -76,7 +76,7 @@
{
CGFloat rate = 0.0;
for (Torrent * torrent in fTorrents)
rate += [torrent uploadRate];
rate += torrent.uploadRate;
return rate;
}
@ -85,7 +85,7 @@
{
CGFloat rate = 0.0;
for (Torrent * torrent in fTorrents)
rate += [torrent downloadRate];
rate += torrent.downloadRate;
return rate;
}

6
macosx/TorrentTableView.h
View File

@ -67,8 +67,8 @@
- (void) setActionButtonHover: (NSInteger) row;
- (void) selectValues: (NSArray *) values;
- (NSArray *) selectedValues;
- (NSArray *) selectedTorrents;
@property (nonatomic, readonly) NSArray *selectedValues;
@property (nonatomic, readonly) NSArray *selectedTorrents;
- (NSRect) iconRectForRow: (NSInteger) row;
@ -88,7 +88,7 @@
- (void) setPriority: (id) sender;
- (void) togglePiecesBar;
- (CGFloat) piecesBarPercent;
@property (nonatomic, readonly) CGFloat piecesBarPercent;
- (void) selectAndScrollToRow: (NSInteger) row;

214
macosx/TorrentTableView.m
View File

@ -53,11 +53,11 @@
@implementation TorrentTableView
- (id) initWithCoder: (NSCoder *) decoder
- (instancetype) initWithCoder: (NSCoder *) decoder
{
if ((self = [super initWithCoder: decoder]))
{
fDefaults = [NSUserDefaults standardUserDefaults];
fDefaults = NSUserDefaults.standardUserDefaults;
fTorrentCell = [[TorrentCell alloc] init];
@ -74,7 +74,7 @@
fActionPopoverShown = NO;
[self setDelegate: self];
self.delegate = self;
fPiecesBarPercent = [fDefaults boolForKey: @"PiecesBar"] ? 1.0 : 0.0;
@ -88,7 +88,7 @@
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
[NSNotificationCenter.defaultCenter removeObserver: self];
}
- (void) awakeFromNib
@ -96,7 +96,7 @@
//set group columns to show ratio, needs to be in awakeFromNib to size columns correctly
[self setGroupStatusColumns];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(setNeedsDisplay) name: @"RefreshTorrentTable" object: nil];
[NSNotificationCenter.defaultCenter addObserver: self selector: @selector(setNeedsDisplay) name: @"RefreshTorrentTable" object: nil];
}
- (BOOL) isGroupCollapsed: (NSInteger) value
@ -132,7 +132,7 @@
- (CGFloat) outlineView: (NSOutlineView *) outlineView heightOfRowByItem: (id) item
{
return [item isKindOfClass: [Torrent class]] ? [self rowHeight] : GROUP_SEPARATOR_HEIGHT;
return [item isKindOfClass: [Torrent class]] ? self.rowHeight : GROUP_SEPARATOR_HEIGHT;
}
- (NSCell *) outlineView: (NSOutlineView *) outlineView dataCellForTableColumn: (NSTableColumn *) tableColumn item: (id) item
@ -151,13 +151,14 @@
{
if (!tableColumn)
{
[cell setRepresentedObject: item];
TorrentCell * torrentCell = cell;
torrentCell.representedObject = item;
const NSInteger row = [self rowForItem: item];
[cell setHover: row == fMouseRow];
[cell setControlHover: row == fMouseControlRow];
[cell setRevealHover: row == fMouseRevealRow];
[cell setActionHover: row == fMouseActionRow];
torrentCell.hover = (row == fMouseRow);
torrentCell.controlHover = (row == fMouseControlRow);
torrentCell.revealHover = (row == fMouseRevealRow);
torrentCell.actionHover = (row == fMouseActionRow);
}
}
}
@ -181,14 +182,14 @@
- (NSString *) outlineView: (NSOutlineView *) outlineView typeSelectStringForTableColumn: (NSTableColumn *) tableColumn item: (id) item
{
if ([item isKindOfClass: [Torrent class]])
return [(Torrent *)item name];
return ((Torrent *)item).name;
else
return [[self dataSource] outlineView:outlineView objectValueForTableColumn:[self tableColumnWithIdentifier:@"Group"] byItem:item];
return [self.dataSource outlineView:outlineView objectValueForTableColumn:[self tableColumnWithIdentifier:@"Group"] byItem:item];
}
- (NSString *) outlineView: (NSOutlineView *) outlineView toolTipForCell: (NSCell *) cell rect: (NSRectPointer) rect tableColumn: (NSTableColumn *) column item: (id) item mouseLocation: (NSPoint) mouseLocation
{
NSString * ident = [column identifier];
NSString * ident = column.identifier;
if ([ident isEqualToString: @"DL"] || [ident isEqualToString: @"DL Image"])
return NSLocalizedString(@"Download speed", "Torrent table -> group row -> tooltip");
else if ([ident isEqualToString: @"UL"] || [ident isEqualToString: @"UL Image"])
@ -196,7 +197,7 @@
: NSLocalizedString(@"Upload speed", "Torrent table -> group row -> tooltip");
else if (ident)
{
NSUInteger count = [[item torrents] count];
NSUInteger count = ((TorrentGroup *)item).torrents.count;
if (count == 1)
return NSLocalizedString(@"1 transfer", "Torrent table -> group row -> tooltip");
else
@ -212,11 +213,11 @@
[super updateTrackingAreas];
[self removeTrackingAreas];
const NSRange rows = [self rowsInRect: [self visibleRect]];
const NSRange rows = [self rowsInRect: self.visibleRect];
if (rows.length == 0)
return;
NSPoint mouseLocation = [self convertPoint: [[self window] mouseLocationOutsideOfEventStream] fromView: nil];
NSPoint mouseLocation = [self convertPoint: self.window.mouseLocationOutsideOfEventStream fromView: nil];
for (NSUInteger row = rows.location; row < NSMaxRange(rows); row++)
{
if (![[self itemAtRow: row] isKindOfClass: [Torrent class]])
@ -235,9 +236,9 @@
fMouseRevealRow = -1;
fMouseActionRow = -1;
for (NSTrackingArea * area in [self trackingAreas])
for (NSTrackingArea * area in self.trackingAreas)
{
if ([area owner] == self && [area userInfo][@"Row"])
if (area.owner == self && area.userInfo[@"Row"])
[self removeTrackingArea: area];
}
}
@ -274,12 +275,12 @@
- (void) mouseEntered: (NSEvent *) event
{
NSDictionary * dict = (NSDictionary *)[event userData];
NSDictionary * dict = (NSDictionary *)event.userData;
NSNumber * row;
if ((row = dict[@"Row"]))
{
NSInteger rowVal = [row integerValue];
NSInteger rowVal = row.integerValue;
NSString * type = dict[@"Type"];
if ([type isEqualToString: @"Action"])
fMouseActionRow = rowVal;
@ -300,7 +301,7 @@
- (void) mouseExited: (NSEvent *) event
{
NSDictionary * dict = (NSDictionary *)[event userData];
NSDictionary * dict = (NSDictionary *)event.userData;
NSNumber * row;
if ((row = dict[@"Row"]))
@ -319,7 +320,7 @@
return;
}
[self setNeedsDisplayInRect: [self rectOfRow: [row integerValue]]];
[self setNeedsDisplayInRect: [self rectOfRow: row.integerValue]];
}
}
@ -333,30 +334,32 @@
- (void) outlineViewItemDidExpand: (NSNotification *) notification
{
NSInteger value = [[notification userInfo][@"NSObject"] groupIndex];
TorrentGroup * group = notification.userInfo[@"NSObject"];
NSInteger value = group.groupIndex;
if (value < 0)
value = MAX_GROUP;
if ([fCollapsedGroups containsIndex: value])
{
[fCollapsedGroups removeIndex: value];
[[NSNotificationCenter defaultCenter] postNotificationName: @"OutlineExpandCollapse" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"OutlineExpandCollapse" object: self];
}
}
- (void) outlineViewItemDidCollapse: (NSNotification *) notification
{
NSInteger value = [[notification userInfo][@"NSObject"] groupIndex];
TorrentGroup * group = notification.userInfo[@"NSObject"];
NSInteger value = group.groupIndex;
if (value < 0)
value = MAX_GROUP;
[fCollapsedGroups addIndex: value];
[[NSNotificationCenter defaultCenter] postNotificationName: @"OutlineExpandCollapse" object: self];
[NSNotificationCenter.defaultCenter postNotificationName: @"OutlineExpandCollapse" object: self];
}
- (void) mouseDown: (NSEvent *) event
{
NSPoint point = [self convertPoint: [event locationInWindow] fromView: nil];
NSPoint point = [self convertPoint: event.locationInWindow fromView: nil];
const NSInteger row = [self rowAtPoint: point];
//check to toggle group status before anything else
@ -372,7 +375,7 @@
//if pushing a button, don't change the selected rows
if (pushed)
fSelectedValues = [self selectedValues];
fSelectedValues = self.selectedValues;
[super mouseDown: event];
@ -384,7 +387,7 @@
#warning maybe make appear on mouse down
[self displayTorrentActionPopoverForEvent: event];
}
else if (!pushed && [event clickCount] == 2) //double click
else if (!pushed && event.clickCount == 2) //double click
{
id item = nil;
if (row != -1)
@ -417,11 +420,12 @@
}
else
{
const NSInteger group = [item groupIndex];
for (NSInteger i = 0; i < [self numberOfRows]; i++)
TorrentGroup * group = (TorrentGroup *)item;
const NSInteger groupIndex = group.groupIndex;
for (NSInteger i = 0; i < self.numberOfRows; i++)
{
id tableItem = [self itemAtRow: i];
if ([tableItem isKindOfClass: [TorrentGroup class]] && group == [tableItem groupIndex])
if ([tableItem isKindOfClass: [TorrentGroup class]] && groupIndex == ((TorrentGroup *)tableItem).groupIndex)
{
[indexSet addIndex: i];
break;
@ -435,10 +439,10 @@
- (NSArray *) selectedValues
{
NSIndexSet * selectedIndexes = [self selectedRowIndexes];
NSMutableArray * values = [NSMutableArray arrayWithCapacity: [selectedIndexes count]];
NSIndexSet * selectedIndexes = self.selectedRowIndexes;
NSMutableArray * values = [NSMutableArray arrayWithCapacity: selectedIndexes.count];
for (NSUInteger i = [selectedIndexes firstIndex]; i != NSNotFound; i = [selectedIndexes indexGreaterThanIndex: i])
for (NSUInteger i = selectedIndexes.firstIndex; i != NSNotFound; i = [selectedIndexes indexGreaterThanIndex: i])
[values addObject: [self itemAtRow: i]];
return values;
@ -446,20 +450,20 @@
- (NSArray *) selectedTorrents
{
NSIndexSet * selectedIndexes = [self selectedRowIndexes];
NSMutableArray * torrents = [NSMutableArray arrayWithCapacity: [selectedIndexes count]]; //take a shot at guessing capacity
NSIndexSet * selectedIndexes = self.selectedRowIndexes;
NSMutableArray * torrents = [NSMutableArray arrayWithCapacity: selectedIndexes.count]; //take a shot at guessing capacity
for (NSUInteger i = [selectedIndexes firstIndex]; i != NSNotFound; i = [selectedIndexes indexGreaterThanIndex: i])
for (NSUInteger i = selectedIndexes.firstIndex; i != NSNotFound; i = [selectedIndexes indexGreaterThanIndex: i])
{
id item = [self itemAtRow: i];
if ([item isKindOfClass: [Torrent class]])
[torrents addObject: item];
else
{
NSArray * groupTorrents = [item torrents];
NSArray * groupTorrents = ((TorrentGroup *)item).torrents;
[torrents addObjectsFromArray: groupTorrents];
if ([self isItemExpanded: item])
i +=[groupTorrents count];
i +=groupTorrents.count;
}
}
@ -468,7 +472,7 @@
- (NSMenu *) menuForEvent: (NSEvent *) event
{
NSInteger row = [self rowAtPoint: [self convertPoint: [event locationInWindow] fromView: nil]];
NSInteger row = [self rowAtPoint: [self convertPoint: event.locationInWindow fromView: nil]];
if (row >= 0)
{
if (![self isRowSelected: row])
@ -492,13 +496,13 @@
//option-command-f will focus the filter bar's search field
- (void) keyDown: (NSEvent *) event
{
const unichar firstChar = [[event charactersIgnoringModifiers] characterAtIndex: 0];
const unichar firstChar = [event.charactersIgnoringModifiers characterAtIndex: 0];
if (firstChar == 'f' && [event modifierFlags] & NSAlternateKeyMask && [event modifierFlags] & NSCommandKeyMask)
if (firstChar == 'f' && event.modifierFlags & NSAlternateKeyMask && event.modifierFlags & NSCommandKeyMask)
[fController focusFilterField];
else if (firstChar == ' ')
[fController toggleQuickLook: nil];
else if ([event keyCode] == 53) //esc key
else if (event.keyCode == 53) //esc key
[self deselectAll: nil];
else
[super keyDown: event];
@ -512,24 +516,24 @@
- (void) paste: (id) sender
{
NSURL * url;
if ((url = [NSURL URLFromPasteboard: [NSPasteboard generalPasteboard]]))
[fController openURL: [url absoluteString]];
if ((url = [NSURL URLFromPasteboard: NSPasteboard.generalPasteboard]))
[fController openURL: url.absoluteString];
else
{
NSArray * items = [[NSPasteboard generalPasteboard] readObjectsForClasses: @[[NSString class]] options: nil];
NSArray * items = [NSPasteboard.generalPasteboard readObjectsForClasses: @[[NSString class]] options: nil];
if (items)
{
NSDataDetector * detector = [NSDataDetector dataDetectorWithTypes: NSTextCheckingTypeLink error: nil];
for (__strong NSString * pbItem in items)
{
pbItem = [pbItem stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
pbItem = [pbItem stringByTrimmingCharactersInSet: NSCharacterSet.whitespaceAndNewlineCharacterSet];
if ([pbItem rangeOfString: @"magnet:" options: (NSAnchoredSearch | NSCaseInsensitiveSearch)].location != NSNotFound)
[fController openURL: pbItem];
else
{
#warning only accept full text?
for (NSTextCheckingResult * result in [detector matchesInString: pbItem options: 0 range: NSMakeRange(0, [pbItem length])])
[fController openURL: [[result URL] absoluteString]];
for (NSTextCheckingResult * result in [detector matchesInString: pbItem options: 0 range: NSMakeRange(0, pbItem.length)])
[fController openURL: result.URL.absoluteString];
}
}
}
@ -538,22 +542,22 @@
- (BOOL) validateMenuItem: (NSMenuItem *) menuItem
{
SEL action = [menuItem action];
SEL action = menuItem.action;
if (action == @selector(paste:))
{
if ([[[NSPasteboard generalPasteboard] types] containsObject: NSURLPboardType])
if ([NSPasteboard.generalPasteboard.types containsObject: NSURLPboardType])
return YES;
NSArray * items = [[NSPasteboard generalPasteboard] readObjectsForClasses: @[[NSString class]] options: nil];
NSArray * items = [NSPasteboard.generalPasteboard readObjectsForClasses: @[[NSString class]] options: nil];
if (items)
{
NSDataDetector * detector = [NSDataDetector dataDetectorWithTypes: NSTextCheckingTypeLink error: nil];
for (__strong NSString * pbItem in items)
{
pbItem = [pbItem stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
pbItem = [pbItem stringByTrimmingCharactersInSet: NSCharacterSet.whitespaceAndNewlineCharacterSet];
if (([pbItem rangeOfString: @"magnet:" options: (NSAnchoredSearch | NSCaseInsensitiveSearch)].location != NSNotFound)
|| [detector firstMatchInString: pbItem options: 0 range: NSMakeRange(0, [pbItem length])])
|| [detector firstMatchInString: pbItem options: 0 range: NSMakeRange(0, pbItem.length)])
return YES;
}
}
@ -566,13 +570,13 @@
- (void) toggleControlForTorrent: (Torrent *) torrent
{
if ([torrent isActive])
if (torrent.active)
[fController stopTorrents: @[torrent]];
else
{
if ([NSEvent modifierFlags] & NSAlternateKeyMask)
if (NSEvent.modifierFlags & NSAlternateKeyMask)
[fController resumeTorrentsNoWait: @[torrent]];
else if ([torrent waitingToStart])
else if (torrent.waitingToStart)
[fController stopTorrents: @[torrent]];
else
[fController resumeTorrents: @[torrent]];
@ -581,7 +585,7 @@
- (void) displayTorrentActionPopoverForEvent: (NSEvent *) event
{
const NSInteger row = [self rowAtPoint: [self convertPoint: [event locationInWindow] fromView: nil]];
const NSInteger row = [self rowAtPoint: [self convertPoint: event.locationInWindow fromView: nil]];
if (row < 0)
return;
@ -593,10 +597,10 @@
Torrent * torrent = [self itemAtRow: row];
NSPopover * popover = [[NSPopover alloc] init];
[popover setBehavior: NSPopoverBehaviorTransient];
popover.behavior = NSPopoverBehaviorTransient;
InfoOptionsViewController * infoViewController = [[InfoOptionsViewController alloc] init];
[popover setContentViewController: infoViewController];
[popover setDelegate: self];
popover.contentViewController = infoViewController;
popover.delegate = self;
[popover showRelativeToRect: rect ofView: self preferredEdge: NSMaxYEdge];
[infoViewController setInfoForTorrents: @[torrent]];
@ -619,13 +623,13 @@
- (void) menuNeedsUpdate: (NSMenu *) menu
{
//this method seems to be called when it shouldn't be
if (!fMenuTorrent || ![menu supermenu])
if (!fMenuTorrent || !menu.supermenu)
return;
if (menu == fUploadMenu || menu == fDownloadMenu)
{
NSMenuItem * item;
if ([menu numberOfItems] == 3)
if (menu.numberOfItems == 3)
{
const NSInteger speedLimitActionValue[] = { 0, 5, 10, 20, 30, 40, 50, 75, 100, 150, 200, 250, 500,
750, 1000, 1500, 2000, -1 };
@ -635,8 +639,8 @@
item = [[NSMenuItem alloc] initWithTitle: [NSString stringWithFormat: NSLocalizedString(@"%d KB/s",
"Action menu -> upload/download limit"), speedLimitActionValue[i]] action: @selector(setQuickLimit:)
keyEquivalent: @""];
[item setTarget: self];
[item setRepresentedObject: @(speedLimitActionValue[i])];
item.target = self;
item.representedObject = @(speedLimitActionValue[i]);
[menu addItem: item];
}
}
@ -645,17 +649,17 @@
const BOOL limit = [fMenuTorrent usesSpeedLimit: upload];
item = [menu itemWithTag: ACTION_MENU_LIMIT_TAG];
[item setState: limit ? NSOnState : NSOffState];
[item setTitle: [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)",
"torrent action menu -> upload/download limit"), [fMenuTorrent speedLimit: upload]]];
item.state = limit ? NSOnState : NSOffState;
item.title = [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)",
"torrent action menu -> upload/download limit"), [fMenuTorrent speedLimit: upload]];
item = [menu itemWithTag: ACTION_MENU_UNLIMITED_TAG];
[item setState: !limit ? NSOnState : NSOffState];
item.state = !limit ? NSOnState : NSOffState;
}
else if (menu == fRatioMenu)
{
NSMenuItem * item;
if ([menu numberOfItems] == 4)
if (menu.numberOfItems == 4)
{
const float ratioLimitActionValue[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, -1.0 };
@ -663,37 +667,37 @@
{
item = [[NSMenuItem alloc] initWithTitle: [NSString localizedStringWithFormat: @"%.2f", ratioLimitActionValue[i]]
action: @selector(setQuickRatio:) keyEquivalent: @""];
[item setTarget: self];
[item setRepresentedObject: @(ratioLimitActionValue[i])];
item.target = self;
item.representedObject = @(ratioLimitActionValue[i]);
[menu addItem: item];
}
}
const tr_ratiolimit mode = [fMenuTorrent ratioSetting];
const tr_ratiolimit mode = fMenuTorrent.ratioSetting;
item = [menu itemWithTag: ACTION_MENU_LIMIT_TAG];
[item setState: mode == TR_RATIOLIMIT_SINGLE ? NSOnState : NSOffState];
[item setTitle: [NSString localizedStringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)",
"torrent action menu -> ratio stop"), [fMenuTorrent ratioLimit]]];
item.state = mode == TR_RATIOLIMIT_SINGLE ? NSOnState : NSOffState;
item.title = [NSString localizedStringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)",
"torrent action menu -> ratio stop"), fMenuTorrent.ratioLimit];
item = [menu itemWithTag: ACTION_MENU_UNLIMITED_TAG];
[item setState: mode == TR_RATIOLIMIT_UNLIMITED ? NSOnState : NSOffState];
item.state = mode == TR_RATIOLIMIT_UNLIMITED ? NSOnState : NSOffState;
item = [menu itemWithTag: ACTION_MENU_GLOBAL_TAG];
[item setState: mode == TR_RATIOLIMIT_GLOBAL ? NSOnState : NSOffState];
item.state = mode == TR_RATIOLIMIT_GLOBAL ? NSOnState : NSOffState;
}
else if (menu == fPriorityMenu)
{
const tr_priority_t priority = [fMenuTorrent priority];
const tr_priority_t priority = fMenuTorrent.priority;
NSMenuItem * item = [menu itemWithTag: ACTION_MENU_PRIORITY_HIGH_TAG];
[item setState: priority == TR_PRI_HIGH ? NSOnState : NSOffState];
item.state = priority == TR_PRI_HIGH ? NSOnState : NSOffState;
item = [menu itemWithTag: ACTION_MENU_PRIORITY_NORMAL_TAG];
[item setState: priority == TR_PRI_NORMAL ? NSOnState : NSOffState];
item.state = priority == TR_PRI_NORMAL ? NSOnState : NSOffState;
item = [menu itemWithTag: ACTION_MENU_PRIORITY_LOW_TAG];
[item setState: priority == TR_PRI_LOW ? NSOnState : NSOffState];
item.state = priority == TR_PRI_LOW ? NSOnState : NSOffState;
}
}
@ -703,7 +707,7 @@
const BOOL limit = [sender tag] == ACTION_MENU_LIMIT_TAG;
[fMenuTorrent setUseSpeedLimit: limit upload: [sender menu] == fUploadMenu];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptions" object: nil];
}
- (void) setQuickLimit: (id) sender
@ -712,14 +716,14 @@
[fMenuTorrent setUseSpeedLimit: YES upload: upload];
[fMenuTorrent setSpeedLimit: [[sender representedObject] intValue] upload: upload];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptions" object: nil];
}
- (void) setGlobalLimit: (id) sender
{
[fMenuTorrent setUseGlobalSpeedLimit: [(NSButton *)sender state] != NSOnState];
fMenuTorrent.usesGlobalSpeedLimit = ((NSButton *)sender).state != NSOnState;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptions" object: nil];
}
- (void) setQuickRatioMode: (id) sender
@ -740,17 +744,17 @@
return;
}
[fMenuTorrent setRatioSetting: mode];
fMenuTorrent.ratioSetting = mode;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptions" object: nil];
}
- (void) setQuickRatio: (id) sender
{
[fMenuTorrent setRatioSetting: TR_RATIOLIMIT_SINGLE];
[fMenuTorrent setRatioLimit: [[sender representedObject] floatValue]];
fMenuTorrent.ratioSetting = TR_RATIOLIMIT_SINGLE;
fMenuTorrent.ratioLimit = [[sender representedObject] floatValue];
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateOptions" object: nil];
}
- (void) setPriority: (id) sender
@ -772,9 +776,9 @@
priority = TR_PRI_NORMAL;
}
[fMenuTorrent setPriority: priority];
fMenuTorrent.priority = priority;
[[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil];
[NSNotificationCenter.defaultCenter postNotificationName: @"UpdateUI" object: nil];
}
- (void) togglePiecesBar
@ -785,9 +789,9 @@
//this stops a previous animation
fPiecesBarAnimation = [[NSAnimation alloc] initWithDuration: TOGGLE_PROGRESS_SECONDS animationCurve: NSAnimationEaseIn];
[fPiecesBarAnimation setAnimationBlockingMode: NSAnimationNonblocking];
[fPiecesBarAnimation setProgressMarks: progressMarks];
[fPiecesBarAnimation setDelegate: self];
fPiecesBarAnimation.animationBlockingMode = NSAnimationNonblocking;
fPiecesBarAnimation.progressMarks = progressMarks;
fPiecesBarAnimation.delegate = self;
[fPiecesBarAnimation startAnimation];
}
@ -809,7 +813,7 @@
else
fPiecesBarPercent = 1.0 - progress;
[self setNeedsDisplay: YES];
self.needsDisplay = YES;
}
}
@ -821,19 +825,19 @@
- (void) selectAndScrollToRow: (NSInteger) row
{
NSParameterAssert(row >= 0);
NSParameterAssert(row < [self numberOfRows]);
NSParameterAssert(row < self.numberOfRows);
[self selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection: NO];
const NSRect rowRect = [self rectOfRow: row];
const NSRect viewRect = [[self superview] frame];
const NSRect viewRect = self.superview.frame;
NSPoint scrollOrigin = rowRect.origin;
scrollOrigin.y += (rowRect.size.height - viewRect.size.height) / 2;
if (scrollOrigin.y < 0)
scrollOrigin.y = 0;
[[[self superview] animator] setBoundsOrigin: scrollOrigin];
[[self.superview animator] setBoundsOrigin: scrollOrigin];
}
@end
@ -846,7 +850,7 @@
if (row < 0 || [[self itemAtRow: row] isKindOfClass: [Torrent class]])
return NO;
NSString * ident = [[self tableColumns][[self columnAtPoint: point]] identifier];
NSString * ident = (self.tableColumns[[self columnAtPoint: point]]).identifier;
return [ident isEqualToString: @"UL"] || [ident isEqualToString: @"UL Image"]
|| [ident isEqualToString: @"DL"] || [ident isEqualToString: @"DL Image"];
}
@ -855,8 +859,8 @@
{
const BOOL ratio = [fDefaults boolForKey: @"DisplayGroupRowRatio"];
[[self tableColumnWithIdentifier: @"DL"] setHidden: ratio];
[[self tableColumnWithIdentifier: @"DL Image"] setHidden: ratio];
[self tableColumnWithIdentifier: @"DL"].hidden = ratio;
[self tableColumnWithIdentifier: @"DL Image"].hidden = ratio;
}
@end

48
macosx/TrackerCell.m
View File

@ -38,7 +38,7 @@
@interface TrackerCell (Private)
- (NSImage *) favIcon;
@property (nonatomic, readonly) NSImage *favIcon;
- (void) loadTrackerIcon: (NSString *) baseAddress;
- (NSRect) imageRectForBounds: (NSRect) bounds;
@ -48,7 +48,7 @@
- (NSRect) rectForStatusWithString: (NSAttributedString *) string withAboveRect: (NSRect) aboveRect withRightRect: (NSRect) rightRect
inBounds: (NSRect) bounds;
- (NSAttributedString *) attributedName;
@property (nonatomic, readonly) NSAttributedString *attributedName;
- (NSAttributedString *) attributedStatusWithString: (NSString *) statusString;
- (NSAttributedString *) attributedCount: (NSInteger) count;
@ -66,12 +66,12 @@ NSMutableSet * fTrackerIconLoading;
fTrackerIconLoading = [[NSMutableSet alloc] init];
}
- (id) init
- (instancetype) init
{
if ((self = [super init]))
{
NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
[paragraphStyle setLineBreakMode: NSLineBreakByTruncatingTail];
NSMutableParagraphStyle * paragraphStyle = [NSParagraphStyle.defaultParagraphStyle mutableCopy];
paragraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
fNameAttributes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
[NSFont messageFontOfSize: 12.0], NSFontAttributeName,
@ -99,38 +99,38 @@ NSMutableSet * fTrackerIconLoading;
- (void) drawWithFrame: (NSRect) cellFrame inView: (NSView *) controlView
{
//icon
[[self favIcon] drawInRect: [self imageRectForBounds: cellFrame] fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];
[self.favIcon drawInRect: [self imageRectForBounds: cellFrame] fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];
//set table colors
NSColor * nameColor, * statusColor;
if ([self backgroundStyle] == NSBackgroundStyleDark)
nameColor = statusColor = [NSColor whiteColor];
if (self.backgroundStyle == NSBackgroundStyleDark)
nameColor = statusColor = NSColor.whiteColor;
else
{
nameColor = [NSColor labelColor];
statusColor = [NSColor secondaryLabelColor];
nameColor = NSColor.labelColor;
statusColor = NSColor.secondaryLabelColor;
}
fNameAttributes[NSForegroundColorAttributeName] = nameColor;
fStatusAttributes[NSForegroundColorAttributeName] = statusColor;
TrackerNode * node = (TrackerNode *)[self objectValue];
TrackerNode * node = (TrackerNode *)self.objectValue;
//name
NSAttributedString * nameString = [self attributedName];
NSAttributedString * nameString = self.attributedName;
const NSRect nameRect = [self rectForNameWithString: nameString inBounds: cellFrame];
[nameString drawInRect: nameRect];
//count strings
NSAttributedString * seederString = [self attributedCount: [node totalSeeders]];
NSAttributedString * seederString = [self attributedCount: node.totalSeeders];
const NSRect seederRect = [self rectForCountWithString: seederString withAboveRect: nameRect inBounds: cellFrame];
[seederString drawInRect: seederRect];
NSAttributedString * leecherString = [self attributedCount: [node totalLeechers]];
NSAttributedString * leecherString = [self attributedCount: node.totalLeechers];
const NSRect leecherRect = [self rectForCountWithString: leecherString withAboveRect: seederRect inBounds: cellFrame];
[leecherString drawInRect: leecherRect];
NSAttributedString * downloadedString = [self attributedCount: [node totalDownloaded]];
NSAttributedString * downloadedString = [self attributedCount: node.totalDownloaded];
const NSRect downloadedRect = [self rectForCountWithString: downloadedString withAboveRect: leecherRect inBounds: cellFrame];
[downloadedString drawInRect: downloadedRect];
@ -154,17 +154,17 @@ NSMutableSet * fTrackerIconLoading;
[downloadedLabelString drawInRect: downloadedLabelRect];
//status strings
NSAttributedString * lastAnnounceString = [self attributedStatusWithString: [node lastAnnounceStatusString]];
NSAttributedString * lastAnnounceString = [self attributedStatusWithString: node.lastAnnounceStatusString];
const NSRect lastAnnounceRect = [self rectForStatusWithString: lastAnnounceString withAboveRect: nameRect
withRightRect: seederLabelRect inBounds: cellFrame];
[lastAnnounceString drawInRect: lastAnnounceRect];
NSAttributedString * nextAnnounceString = [self attributedStatusWithString: [node nextAnnounceStatusString]];
NSAttributedString * nextAnnounceString = [self attributedStatusWithString: node.nextAnnounceStatusString];
const NSRect nextAnnounceRect = [self rectForStatusWithString: nextAnnounceString withAboveRect: lastAnnounceRect
withRightRect: leecherLabelRect inBounds: cellFrame];
[nextAnnounceString drawInRect: nextAnnounceRect];
NSAttributedString * lastScrapeString = [self attributedStatusWithString: [node lastScrapeStatusString]];
NSAttributedString * lastScrapeString = [self attributedStatusWithString: node.lastScrapeStatusString];
const NSRect lastScrapeRect = [self rectForStatusWithString: lastScrapeString withAboveRect: nextAnnounceRect
withRightRect: downloadedLabelRect inBounds: cellFrame];
[lastScrapeString drawInRect: lastScrapeRect];
@ -177,20 +177,20 @@ NSMutableSet * fTrackerIconLoading;
- (NSImage *) favIcon
{
id icon = nil;
NSURL * address = [NSURL URLWithString: [(TrackerNode *)[self objectValue] fullAnnounceAddress]];
NSURL * address = [NSURL URLWithString: ((TrackerNode *)self.objectValue).fullAnnounceAddress];
NSString * host;
if ((host = [address host]))
if ((host = address.host))
{
//don't try to parse ip address
const BOOL separable = !tr_addressIsIP([host UTF8String]);
const BOOL separable = !tr_addressIsIP(host.UTF8String);
NSArray * hostComponents = separable ? [host componentsSeparatedByString: @"."] : nil;
//let's try getting the tracker address without using any subdomains
NSString * baseAddress;
if (separable && [hostComponents count] > 1)
if (separable && hostComponents.count > 1)
baseAddress = [NSString stringWithFormat: @"http://%@.%@",
hostComponents[[hostComponents count]-2], [hostComponents lastObject]];
hostComponents[hostComponents.count-2], hostComponents.lastObject];
else
baseAddress = [NSString stringWithFormat: @"http://%@", host];
@ -292,7 +292,7 @@ NSMutableSet * fTrackerIconLoading;
- (NSAttributedString *) attributedName
{
NSString * name = [(TrackerNode *)[self objectValue] host];
NSString * name = ((TrackerNode *)self.objectValue).host;
return [[NSAttributedString alloc] initWithString: name attributes: fNameAttributes];
}

22
macosx/TrackerNode.h
View File

@ -30,23 +30,23 @@
@property (nonatomic, weak, readonly) Torrent * torrent;
- (id) initWithTrackerStat: (tr_tracker_stat *) stat torrent: (Torrent *) torrent;
- (instancetype) initWithTrackerStat: (tr_tracker_stat *) stat torrent: (Torrent *) torrent;
- (BOOL) isEqual: (id) object;
- (NSString *) host;
- (NSString *) fullAnnounceAddress;
@property (nonatomic, readonly) NSString *host;
@property (nonatomic, readonly) NSString *fullAnnounceAddress;
- (NSInteger) tier;
@property (nonatomic, readonly) NSInteger tier;
- (NSUInteger) identifier;
@property (nonatomic, readonly) NSUInteger identifier;
- (NSInteger) totalSeeders;
- (NSInteger) totalLeechers;
- (NSInteger) totalDownloaded;
@property (nonatomic, readonly) NSInteger totalSeeders;
@property (nonatomic, readonly) NSInteger totalLeechers;
@property (nonatomic, readonly) NSInteger totalDownloaded;
- (NSString *) lastAnnounceStatusString;
- (NSString *) nextAnnounceStatusString;
- (NSString *) lastScrapeStatusString;
@property (nonatomic, readonly) NSString *lastAnnounceStatusString;
@property (nonatomic, readonly) NSString *nextAnnounceStatusString;
@property (nonatomic, readonly) NSString *lastScrapeStatusString;
@end

25
macosx/TrackerNode.m
View File

@ -29,7 +29,7 @@
tr_tracker_stat fStat;
}
- (id) initWithTrackerStat: (tr_tracker_stat *) stat torrent: (Torrent *) torrent
- (instancetype) initWithTrackerStat: (tr_tracker_stat *) stat torrent: (Torrent *) torrent
{
if ((self = [super init]))
{
@ -42,7 +42,7 @@
- (NSString *) description
{
return [@"Tracker: " stringByAppendingString: [self fullAnnounceAddress]];
return [@"Tracker: " stringByAppendingString: self.fullAnnounceAddress];
}
- (id) copyWithZone: (NSZone *) zone
@ -58,11 +58,12 @@
if (![object isKindOfClass: [self class]])
return NO;
if ([self torrent] != [object torrent])
typeof(self) other = (typeof(self))object;
if (self.torrent != other.torrent)
return NO;
return [self tier] == [object tier] && [[self fullAnnounceAddress] isEqualToString: [object fullAnnounceAddress]];
return self.tier == other.tier && [self.fullAnnounceAddress isEqualToString: other.fullAnnounceAddress];
}
- (NSString *) host
@ -106,9 +107,9 @@
if (fStat.hasAnnounced)
{
NSDateFormatter * dateFormatter = [[NSDateFormatter alloc] init];
[dateFormatter setDateStyle: NSDateFormatterFullStyle];
[dateFormatter setTimeStyle: NSDateFormatterShortStyle];
[dateFormatter setDoesRelativeDateFormatting: YES];
dateFormatter.dateStyle = NSDateFormatterFullStyle;
dateFormatter.timeStyle = NSDateFormatterShortStyle;
dateFormatter.doesRelativeDateFormatting = YES;
dateString = [dateFormatter stringFromDate: [NSDate dateWithTimeIntervalSince1970: fStat.lastAnnounceTime]];
}
@ -155,7 +156,7 @@
case TR_TRACKER_WAITING:
{
const NSTimeInterval nextAnnounceTimeLeft = fStat.nextAnnounceTime - [[NSDate date] timeIntervalSince1970];
const NSTimeInterval nextAnnounceTimeLeft = fStat.nextAnnounceTime - [NSDate date].timeIntervalSince1970;
static NSDateComponentsFormatter *formatter;
static dispatch_once_t onceToken;
@ -189,9 +190,9 @@
if (fStat.hasScraped)
{
NSDateFormatter * dateFormatter = [[NSDateFormatter alloc] init];
[dateFormatter setDateStyle: NSDateFormatterFullStyle];
[dateFormatter setTimeStyle: NSDateFormatterShortStyle];
[dateFormatter setDoesRelativeDateFormatting: YES];
dateFormatter.dateStyle = NSDateFormatterFullStyle;
dateFormatter.timeStyle = NSDateFormatterShortStyle;
dateFormatter.doesRelativeDateFormatting = YES;
dateString = [dateFormatter stringFromDate: [NSDate dateWithTimeIntervalSince1970: fStat.lastScrapeTime]];
}

24
macosx/TrackerTableView.m
View File

@ -28,7 +28,7 @@
- (void) mouseDown: (NSEvent *) event
{
[[self window] makeKeyWindow];
[self.window makeKeyWindow];
[super mouseDown: event];
}
@ -44,24 +44,24 @@
- (void) copy: (id) sender
{
NSMutableArray * addresses = [NSMutableArray arrayWithCapacity: [fTrackers count]];
NSIndexSet * indexes = [self selectedRowIndexes];
for (NSUInteger i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
NSMutableArray * addresses = [NSMutableArray arrayWithCapacity: fTrackers.count];
NSIndexSet * indexes = self.selectedRowIndexes;
for (NSUInteger i = indexes.firstIndex; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
{
id item = fTrackers[i];
if (![item isKindOfClass: [TrackerNode class]])
{
for (++i; i < [fTrackers count] && [fTrackers[i] isKindOfClass: [TrackerNode class]]; ++i)
[addresses addObject: [(TrackerNode *)fTrackers[i] fullAnnounceAddress]];
for (++i; i < fTrackers.count && [fTrackers[i] isKindOfClass: [TrackerNode class]]; ++i)
[addresses addObject: ((TrackerNode *)fTrackers[i]).fullAnnounceAddress];
--i;
}
else
[addresses addObject: [(TrackerNode *)item fullAnnounceAddress]];
[addresses addObject: ((TrackerNode *)item).fullAnnounceAddress];
}
NSString * text = [addresses componentsJoinedByString: @"\n"];
NSPasteboard * pb = [NSPasteboard generalPasteboard];
NSPasteboard * pb = NSPasteboard.generalPasteboard;
[pb clearContents];
[pb writeObjects: @[text]];
}
@ -72,7 +72,7 @@
BOOL added = NO;
NSArray * items = [[NSPasteboard generalPasteboard] readObjectsForClasses: @[[NSString class]] options: nil];
NSArray * items = [NSPasteboard.generalPasteboard readObjectsForClasses: @[[NSString class]] options: nil];
NSAssert(items != nil, @"no string items to paste; should not be able to call this method");
for (NSString * pbItem in items)
@ -89,13 +89,13 @@
- (BOOL) validateMenuItem: (NSMenuItem *) menuItem
{
const SEL action = [menuItem action];
const SEL action = menuItem.action;
if (action == @selector(copy:))
return [self numberOfSelectedRows] > 0;
return self.numberOfSelectedRows > 0;
if (action == @selector(paste:))
return fTorrent && [[NSPasteboard generalPasteboard] canReadObjectForClasses: @[[NSString class]] options: nil];
return fTorrent && [NSPasteboard.generalPasteboard canReadObjectForClasses: @[[NSString class]] options: nil];
return YES;
}

4
macosx/URLSheetWindowController.h
View File

@ -33,11 +33,11 @@
Controller * fController;
}
- (id) initWithController: (Controller *) controller;
- (instancetype) initWithController: (Controller *) controller;
- (void) openURLEndSheet: (id) sender;
- (void) openURLCancelEndSheet: (id) sender;
- (NSString *) urlString;
@property (nonatomic, readonly) NSString *urlString;
@end

36
macosx/URLSheetWindowController.m
View File

@ -33,7 +33,7 @@
NSString * urlString = nil;
- (id) initWithController: (Controller *) controller
- (instancetype) initWithController: (Controller *) controller
{
if ((self = [self initWithWindowNibName: @"URLSheetWindow"]))
{
@ -44,26 +44,26 @@ NSString * urlString = nil;
- (void) awakeFromNib
{
[fLabelField setStringValue: NSLocalizedString(@"Internet address of torrent file:", "URL sheet label")];
fLabelField.stringValue = NSLocalizedString(@"Internet address of torrent file:", "URL sheet label");
if (urlString)
{
[fTextField setStringValue: urlString];
fTextField.stringValue = urlString;
[fTextField selectText: self];
[self updateOpenButtonForURL: urlString];
}
[fOpenButton setTitle: NSLocalizedString(@"Open", "URL sheet button")];
[fCancelButton setTitle: NSLocalizedString(@"Cancel", "URL sheet button")];
fOpenButton.title = NSLocalizedString(@"Open", "URL sheet button");
fCancelButton.title = NSLocalizedString(@"Cancel", "URL sheet button");
[fOpenButton sizeToFit];
[fCancelButton sizeToFit];
//size the two buttons the same
NSRect openFrame = [fOpenButton frame];
NSRect openFrame = fOpenButton.frame;
openFrame.size.width += 10.0;
NSRect cancelFrame = [fCancelButton frame];
NSRect cancelFrame = fCancelButton.frame;
cancelFrame.size.width += 10.0;
if (NSWidth(openFrame) > NSWidth(cancelFrame))
@ -71,33 +71,33 @@ NSString * urlString = nil;
else
openFrame.size.width = NSWidth(cancelFrame);
openFrame.origin.x = NSWidth([[self window] frame]) - NSWidth(openFrame) - 20.0 + 6.0; //I don't know why the extra 6.0 is needed
[fOpenButton setFrame: openFrame];
openFrame.origin.x = NSWidth(self.window.frame) - NSWidth(openFrame) - 20.0 + 6.0; //I don't know why the extra 6.0 is needed
fOpenButton.frame = openFrame;
cancelFrame.origin.x = NSMinX(openFrame) - NSWidth(cancelFrame);
[fCancelButton setFrame: cancelFrame];
fCancelButton.frame = cancelFrame;
}
- (void) openURLEndSheet: (id) sender
{
[[self window] orderOut: sender];
[NSApp endSheet: [self window] returnCode: 1];
[self.window orderOut: sender];
[NSApp endSheet: self.window returnCode: 1];
}
- (void) openURLCancelEndSheet: (id) sender
{
[[self window] orderOut: sender];
[NSApp endSheet: [self window] returnCode: 0];
[self.window orderOut: sender];
[NSApp endSheet: self.window returnCode: 0];
}
- (NSString *) urlString
{
return [fTextField stringValue];
return fTextField.stringValue;
}
- (void) controlTextDidChange: (NSNotification *) notification
{
[self updateOpenButtonForURL: [fTextField stringValue]];
[self updateOpenButtonForURL: fTextField.stringValue];
}
@end
@ -112,11 +112,11 @@ NSString * urlString = nil;
else
{
NSRange prefixRange = [string rangeOfString: @"://"];
if (prefixRange.location != NSNotFound && [string length] == NSMaxRange(prefixRange))
if (prefixRange.location != NSNotFound && string.length == NSMaxRange(prefixRange))
enable = NO;
}
[fOpenButton setEnabled: enable];
fOpenButton.enabled = enable;
}
@end

56
macosx/VDKQueue/VDKQueue.h
View File

@ -1,23 +1,23 @@
// VDKQueue.h
// Created by Bryan D K Jones on 28 March 2012
// Copyright 2013 Bryan D K Jones
// VDKQueue.h
// Created by Bryan D K Jones on 28 March 2012
// Copyright 2013 Bryan D K Jones
//
// Based heavily on UKKQueue, which was created and copyrighted by Uli Kusterer on 21 Dec 2003.
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would be
// appreciated but is not required.
// 2. Altered source versions must be plainly marked as such, and must not be
// misrepresented as being the original software.
// 3. This notice may not be removed or altered from any source
// distribution.
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would be
// appreciated but is not required.
// 2. Altered source versions must be plainly marked as such, and must not be
// misrepresented as being the original software.
// 3. This notice may not be removed or altered from any source
// distribution.
//
// BASED ON UKKQUEUE:
@ -72,15 +72,15 @@
// Logical OR these values into the u_int that you pass in the -addPath:notifyingAbout: method
// to specify the types of notifications you're interested in. Pass the default value to receive all of them.
//
#define VDKQueueNotifyAboutRename NOTE_RENAME // Item was renamed.
#define VDKQueueNotifyAboutWrite NOTE_WRITE // Item contents changed (also folder contents changed).
#define VDKQueueNotifyAboutDelete NOTE_DELETE // item was removed.
#define VDKQueueNotifyAboutAttributeChange NOTE_ATTRIB // Item attributes changed.
#define VDKQueueNotifyAboutSizeIncrease NOTE_EXTEND // Item size increased.
#define VDKQueueNotifyAboutLinkCountChanged NOTE_LINK // Item's link count changed.
#define VDKQueueNotifyAboutAccessRevocation NOTE_REVOKE // Access to item was revoked.
#define VDKQueueNotifyAboutRename NOTE_RENAME // Item was renamed.
#define VDKQueueNotifyAboutWrite NOTE_WRITE // Item contents changed (also folder contents changed).
#define VDKQueueNotifyAboutDelete NOTE_DELETE // item was removed.
#define VDKQueueNotifyAboutAttributeChange NOTE_ATTRIB // Item attributes changed.
#define VDKQueueNotifyAboutSizeIncrease NOTE_EXTEND // Item size increased.
#define VDKQueueNotifyAboutLinkCountChanged NOTE_LINK // Item's link count changed.
#define VDKQueueNotifyAboutAccessRevocation NOTE_REVOKE // Access to item was revoked.
#define VDKQueueNotifyDefault (VDKQueueNotifyAboutRename | VDKQueueNotifyAboutWrite \
#define VDKQueueNotifyDefault (VDKQueueNotifyAboutRename | VDKQueueNotifyAboutWrite \
| VDKQueueNotifyAboutDelete | VDKQueueNotifyAboutAttributeChange \
| VDKQueueNotifyAboutSizeIncrease | VDKQueueNotifyAboutLinkCountChanged \
| VDKQueueNotifyAboutAccessRevocation)
@ -122,8 +122,8 @@ extern NSString * VDKQueueAccessRevocationNotification;
BOOL _alwaysPostNotifications; // By default, notifications are posted only if there is no delegate set. Set this value to YES to have notes posted even when there is a delegate.
@private
int _coreQueueFD; // The actual kqueue ID (Unix file descriptor).
NSMutableDictionary *_watchedPathEntries; // List of VDKQueuePathEntries. Keys are NSStrings of the path that each VDKQueuePathEntry is for.
int _coreQueueFD; // The actual kqueue ID (Unix file descriptor).
NSMutableDictionary *_watchedPathEntries; // List of VDKQueuePathEntries. Keys are NSStrings of the path that each VDKQueuePathEntry is for.
BOOL _keepWatcherThreadRunning; // Set to NO to cancel the thread that watches _coreQueueFD for kQueue events
}
@ -141,7 +141,7 @@ extern NSString * VDKQueueAccessRevocationNotification;
- (void) removeAllPaths;
- (NSUInteger) numberOfWatchedPaths; // Returns the number of paths that this VDKQueue instance is actively watching.
@property (nonatomic, readonly) NSUInteger numberOfWatchedPaths; // Returns the number of paths that this VDKQueue instance is actively watching.

182
macosx/VDKQueue/VDKQueue.m
View File

@ -1,23 +1,23 @@
// VDKQueue.m
// Created by Bryan D K Jones on 28 March 2012
// Copyright 2013 Bryan D K Jones
// VDKQueue.m
// Created by Bryan D K Jones on 28 March 2012
// Copyright 2013 Bryan D K Jones
//
// Based heavily on UKKQueue, which was created and copyrighted by Uli Kusterer on 21 Dec 2003.
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would be
// appreciated but is not required.
// 2. Altered source versions must be plainly marked as such, and must not be
// misrepresented as being the original software.
// 3. This notice may not be removed or altered from any source
// distribution.
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would be
// appreciated but is not required.
// 2. Altered source versions must be plainly marked as such, and must not be
// misrepresented as being the original software.
// 3. This notice may not be removed or altered from any source
// distribution.
#import <AppKit/AppKit.h>
@ -47,12 +47,12 @@ NSString * VDKQueueAccessRevocationNotification = @"VDKQueueAccessWasRevokedNoti
// This is a simple model class used to hold info about each path we watch.
@interface VDKQueuePathEntry : NSObject
{
NSString* _path;
int _watchedFD;
u_int _subscriptionFlags;
NSString* _path;
int _watchedFD;
u_int _subscriptionFlags;
}
- (id) initWithPath:(NSString*)inPath andSubscriptionFlags:(u_int)flags;
- (instancetype) initWithPath:(NSString*)inPath andSubscriptionFlags:(u_int)flags NS_DESIGNATED_INITIALIZER;
@property (atomic, copy) NSString *path;
@property (atomic, assign) int watchedFD;
@ -64,28 +64,28 @@ NSString * VDKQueueAccessRevocationNotification = @"VDKQueueAccessWasRevokedNoti
@synthesize path = _path, watchedFD = _watchedFD, subscriptionFlags = _subscriptionFlags;
- (id) initWithPath:(NSString*)inPath andSubscriptionFlags:(u_int)flags;
- (instancetype) initWithPath:(NSString*)inPath andSubscriptionFlags:(u_int)flags;
{
self = [super init];
if (self)
{
_path = [inPath copy];
_watchedFD = open([_path fileSystemRepresentation], O_EVTONLY, 0);
if (_watchedFD < 0)
{
return nil;
}
_subscriptionFlags = flags;
}
return self;
if (self)
{
_path = [inPath copy];
_watchedFD = open(_path.fileSystemRepresentation, O_EVTONLY, 0);
if (_watchedFD < 0)
{
return nil;
}
_subscriptionFlags = flags;
}
return self;
}
-(void) dealloc
-(void) dealloc
{
if (_watchedFD >= 0) close(_watchedFD);
_watchedFD = -1;
if (_watchedFD >= 0) close(_watchedFD);
_watchedFD = -1;
}
@end
@ -119,21 +119,21 @@ NSString * VDKQueueAccessRevocationNotification = @"VDKQueueAccessWasRevokedNoti
#pragma mark -
#pragma mark INIT/DEALLOC
- (id) init
- (instancetype) init
{
self = [super init];
if (self)
{
_coreQueueFD = kqueue();
if (_coreQueueFD == -1)
{
return nil;
}
self = [super init];
if (self)
{
_coreQueueFD = kqueue();
if (_coreQueueFD == -1)
{
return nil;
}
_alwaysPostNotifications = NO;
_watchedPathEntries = [[NSMutableDictionary alloc] init];
}
return self;
_watchedPathEntries = [[NSMutableDictionary alloc] init];
}
return self;
}
@ -155,47 +155,47 @@ NSString * VDKQueueAccessRevocationNotification = @"VDKQueueAccessWasRevokedNoti
#pragma mark -
#pragma mark PRIVATE METHODS
- (VDKQueuePathEntry *) addPathToQueue:(NSString *)path notifyingAbout:(u_int)flags
- (VDKQueuePathEntry *) addPathToQueue:(NSString *)path notifyingAbout:(u_int)flags
{
@synchronized(self)
{
@synchronized(self)
{
// Are we already watching this path?
VDKQueuePathEntry *pathEntry = _watchedPathEntries[path];
VDKQueuePathEntry *pathEntry = _watchedPathEntries[path];
if (pathEntry)
{
{
// All flags already set?
if(([pathEntry subscriptionFlags] & flags) == flags)
if((pathEntry.subscriptionFlags & flags) == flags)
{
return pathEntry;
return pathEntry;
}
flags |= [pathEntry subscriptionFlags];
}
struct timespec nullts = { 0, 0 };
struct kevent ev;
if (!pathEntry)
flags |= pathEntry.subscriptionFlags;
}
struct timespec nullts = { 0, 0 };
struct kevent ev;
if (!pathEntry)
{
pathEntry = [[VDKQueuePathEntry alloc] initWithPath:path andSubscriptionFlags:flags];
}
if (pathEntry)
{
EV_SET(&ev, [pathEntry watchedFD], EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR, flags, 0, (__bridge void *) pathEntry);
[pathEntry setSubscriptionFlags:flags];
if (pathEntry)
{
EV_SET(&ev, [pathEntry watchedFD], EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR, flags, 0, (__bridge void *) pathEntry);
pathEntry.subscriptionFlags = flags;
_watchedPathEntries[path] = pathEntry;
kevent(_coreQueueFD, &ev, 1, NULL, 0, &nullts);
// Start the thread that fetches and processes our events if it's not already running.
if(!_keepWatcherThreadRunning)
{
_keepWatcherThreadRunning = YES;
[NSThread detachNewThreadSelector:@selector(watcherThread:) toTarget:self withObject:nil];
}
// Start the thread that fetches and processes our events if it's not already running.
if(!_keepWatcherThreadRunning)
{
_keepWatcherThreadRunning = YES;
[NSThread detachNewThreadSelector:@selector(watcherThread:) toTarget:self withObject:nil];
}
}
return pathEntry;
@ -207,17 +207,17 @@ NSString * VDKQueueAccessRevocationNotification = @"VDKQueueAccessWasRevokedNoti
- (void) watcherThread:(id)sender
{
int n;
struct kevent ev;
int n;
struct kevent ev;
struct timespec timeout = { 1, 0 }; // 1 second timeout. Should be longer, but we need this thread to exit when a kqueue is dealloced, so 1 second timeout is quite a while to wait.
int theFD = _coreQueueFD; // So we don't have to risk accessing iVars when the thread is terminated.
int theFD = _coreQueueFD; // So we don't have to risk accessing iVars when the thread is terminated.
NSMutableArray *notesToPost = [[NSMutableArray alloc] initWithCapacity:5];
#if DEBUG_LOG_THREAD_LIFETIME
NSLog(@"watcherThread started.");
NSLog(@"watcherThread started.");
#endif
while(_keepWatcherThreadRunning)
{
@try
@ -295,8 +295,8 @@ NSString * VDKQueueAccessRevocationNotification = @"VDKQueueAccessWasRevokedNoti
if (!_delegate || _alwaysPostNotifications)
{
NSDictionary * userInfoDict = [[NSDictionary alloc] initWithObjects: @[fpath] forKeys: @[@"path"]];
[[[NSWorkspace sharedWorkspace] notificationCenter] postNotificationName:note object:self userInfo:userInfoDict];
NSDictionary * userInfoDict = @{@"path": fpath};
[[NSWorkspace sharedWorkspace].notificationCenter postNotificationName:note object:self userInfo:userInfoDict];
}
}
@ -313,14 +313,14 @@ NSString * VDKQueueAccessRevocationNotification = @"VDKQueueAccessWasRevokedNoti
}
}
// Close our kqueue's file descriptor
if(close(theFD) == -1) {
// Close our kqueue's file descriptor
if(close(theFD) == -1) {
NSLog(@"VDKQueue watcherThread: Couldn't close main kqueue (%d)", errno);
}
#if DEBUG_LOG_THREAD_LIFETIME
NSLog(@"watcherThread finished.");
NSLog(@"watcherThread finished.");
#endif
}
@ -382,14 +382,14 @@ NSString * VDKQueueAccessRevocationNotification = @"VDKQueueAccessWasRevokedNoti
if (!aPath) return;
@synchronized(self)
{
VDKQueuePathEntry *entry = _watchedPathEntries[aPath];
{
VDKQueuePathEntry *entry = _watchedPathEntries[aPath];
// Remove it only if we're watching it.
if (entry) {
[_watchedPathEntries removeObjectForKey:aPath];
}
}
}
}
@ -409,7 +409,7 @@ NSString * VDKQueueAccessRevocationNotification = @"VDKQueueAccessWasRevokedNoti
@synchronized(self)
{
count = [_watchedPathEntries count];
count = _watchedPathEntries.count;
}
return count;

Some files were not shown because too many files have changed in this diff Show More