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

Convert tabs to spaces, remove trailing whitespace (Mac client)

Browse Source
This commit is contained in:
Mike Gelfand
2017-01-24 20:53:16 +03:00
parent cd4b0dc69d
commit 4160743738
100 changed files with 2622 additions and 2622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
macosx/FileRenameSheetController.m
View File

@@ -38,12 +38,12 @@ typedef void (^CompletionBlock)(BOOL);
{
NSParameterAssert(torrent != nil);
NSParameterAssert(window != nil);
FileRenameSheetController * renamer = [[FileRenameSheetController alloc] initWithWindowNibName: @"FileRenameSheetController"];
renamer.torrent = torrent;
renamer.completionHandler = completionHandler;
[NSApp beginSheet: [renamer window] modalForWindow: window modalDelegate: self didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: renamer];
}
@@ -51,13 +51,13 @@ typedef void (^CompletionBlock)(BOOL);
{
NSParameterAssert(node != nil);
NSParameterAssert(window != nil);
FileRenameSheetController * renamer = [[FileRenameSheetController alloc] initWithWindowNibName: @"FileRenameSheetController"];
renamer.torrent = [node torrent];
renamer.node = node;
renamer.completionHandler = completionHandler;
[NSApp beginSheet: [renamer window] modalForWindow: window modalDelegate: self didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: renamer];
}
@@ -65,9 +65,9 @@ typedef void (^CompletionBlock)(BOOL);
{
FileRenameSheetController * renamer = contextInfo;
NSParameterAssert([renamer isKindOfClass:[FileRenameSheetController class]]);
renamer.completionHandler(returnCode == NSOKButton);
//TODO: retain/release logic needs to be figured out for ARC (when ARC is enabled)
[renamer release];
[sheet orderOut: self];
@@ -85,36 +85,36 @@ typedef void (^CompletionBlock)(BOOL);
- (void) windowDidLoad
{
[super windowDidLoad];
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.inputField setStringValue: self.originalName];
[self.renameButton setEnabled: 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];
//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]);
[self.renameButton setTitle: NSLocalizedString(@"Rename", "rename sheet button")];
[self.cancelButton setTitle: NSLocalizedString(@"Cancel", "rename sheet button")];
[self.renameButton sizeToFit];
[self.cancelButton sizeToFit];
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];
const CGFloat cancelWidthIncrease = NSWidth(newCancelFrame) - NSWidth(oldCancelFrame);
newCancelFrame.origin.x -= renameWidthIncrease + cancelWidthIncrease;
[self.cancelButton setFrame:newCancelFrame];
@@ -131,7 +131,7 @@ typedef void (^CompletionBlock)(BOOL);
NSBeep();
}
};
if (self.node)
[self.torrent renameFileNode: self.node withName: [self.inputField stringValue] completionHandler: completionHandler];
else