mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-31 03:12:44 +00:00
Code Issues Releases Wiki Activity

only remove a torrent from the queue for a local error, not tracker error; miscellaneous trivial adjustments

Browse source
This commit is contained in:
Mitchell Livingston 2009-10-17 17:15:37 +00:00
parent 45839606db
commit 94627c81f3
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
macosx/BlocklistDownloaderViewController.m
View file

@ -47,7 +47,7 @@
{ {
[fButton setTitle: NSLocalizedString(@"Cancel", "Blocklist -> cancel button")]; [fButton setTitle: NSLocalizedString(@"Cancel", "Blocklist -> cancel button")];
CGFloat oldWidth = [fButton frame].size.width; const CGFloat oldWidth = [fButton frame].size.width;
[fButton sizeToFit]; [fButton sizeToFit];
NSRect buttonFrame = [fButton frame]; NSRect buttonFrame = [fButton frame];
buttonFrame.size.width += 12.0f; //sizeToFit sizes a bit too small buttonFrame.size.width += 12.0f; //sizeToFit sizes a bit too small

8
macosx/Controller.m
View file

@ -893,7 +893,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
//ensure torrent doesn't already exist //ensure torrent doesn't already exist
tr_ctor * ctor = tr_ctorNew(fLib); tr_ctor * ctor = tr_ctorNew(fLib);
tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]); tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]);
int result = tr_torrentParse(ctor, &info); tr_parse_result result = tr_torrentParse(ctor, &info);
if (result != TR_PARSE_OK) if (result != TR_PARSE_OK)
{ {
if (result == TR_PARSE_DUPLICATE) if (result == TR_PARSE_DUPLICATE)
@ -903,8 +903,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
if (type != ADD_AUTO) if (type != ADD_AUTO)
[self invalidOpenAlert: [torrentPath lastPathComponent]]; [self invalidOpenAlert: [torrentPath lastPathComponent]];
} }
else //this shouldn't happen else
NSLog(@"Unknown error code (%d) when attempting to open \"%@\"", result, torrentPath); NSAssert2(NO, @"Unknown error code (%d) when attempting to open \"%@\"", result, torrentPath);
tr_ctorFree(ctor); tr_ctorFree(ctor);
tr_metainfoFree(&info); tr_metainfoFree(&info);
@ -3983,7 +3983,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
if (seeding > 0 || downloading > 0) if (seeding > 0 || downloading > 0)
{ {
if (!hasSeparator) if (!hasSeparator)
[fDockMenu insertItem: [NSMenuItem separatorItem] atIndex: seeding > 0 && downloading > 0 ? 2 : 1]; [fDockMenu insertItem: [NSMenuItem separatorItem] atIndex: (seeding > 0 && downloading > 0) ? 2 : 1];
} }
else else
{ {

4
macosx/StatsWindowController.m
View file

@ -72,7 +72,7 @@ tr_session * fLib;
stringByAppendingString: @":"]]; stringByAppendingString: @":"]];
//size all elements //size all elements
CGFloat oldWidth = [fUploadedLabelField frame].size.width; const CGFloat oldWidth = [fUploadedLabelField frame].size.width;
[fUploadedLabelField sizeToFit]; [fUploadedLabelField sizeToFit];
[fDownloadedLabelField sizeToFit]; [fDownloadedLabelField sizeToFit];
@ -111,7 +111,7 @@ tr_session * fLib;
[[self window] setFrame: windowRect display: YES]; [[self window] setFrame: windowRect display: YES];
//resize reset button //resize reset button
CGFloat oldButtonWidth = [fResetButton frame].size.width; const CGFloat oldButtonWidth = [fResetButton frame].size.width;
[fResetButton setTitle: NSLocalizedString(@"Reset", "Stats window -> reset button")]; [fResetButton setTitle: NSLocalizedString(@"Reset", "Stats window -> reset button")];
[fResetButton sizeToFit]; [fResetButton sizeToFit];

2
macosx/Torrent.h
View file

@ -161,7 +161,7 @@
- (BOOL) allDownloaded; - (BOOL) allDownloaded;
- (BOOL) isComplete; - (BOOL) isComplete;
- (BOOL) isError; - (BOOL) isError;
- (BOOL) isErrorOrWarning; - (BOOL) isAnyErrorOrWarning;
- (NSString *) errorMessage; - (NSString *) errorMessage;
- (NSArray *) peers; - (NSArray *) peers;

8
macosx/Torrent.m
View file

@ -851,17 +851,17 @@ int trashDataFile(const char * filename)
- (BOOL) isError - (BOOL) isError
{ {
return fStat->error == TR_STAT_LOCAL_ERROR || fStat->error == TR_STAT_TRACKER_ERROR; return fStat->error == TR_STAT_LOCAL_ERROR;
} }
- (BOOL) isErrorOrWarning - (BOOL) isAnyErrorOrWarning
{ {
return fStat->error != TR_STAT_OK; return fStat->error != TR_STAT_OK;
} }
- (NSString *) errorMessage - (NSString *) errorMessage
{ {
if (![self isErrorOrWarning]) if (![self isAnyErrorOrWarning])
return @""; return @"";
NSString * error; NSString * error;
@ -994,7 +994,7 @@ int trashDataFile(const char * filename)
{ {
NSString * string; NSString * string;
if ([self isErrorOrWarning]) if ([self isAnyErrorOrWarning])
{ {
switch (fStat->error) switch (fStat->error)
{ {

2
macosx/TorrentCell.m
View file

@ -429,7 +429,7 @@
[gradient release]; [gradient release];
} }
const BOOL error = [torrent isErrorOrWarning]; const BOOL error = [torrent isAnyErrorOrWarning];
//icon //icon
if (!minimal || !(!fTracking && fHoverAction)) //don't show in minimal mode when hovered over if (!minimal || !(!fTracking && fHoverAction)) //don't show in minimal mode when hovered over

2
macosx/TorrentTableView.m
View file

@ -139,7 +139,7 @@
- (NSCell *) outlineView: (NSOutlineView *) outlineView dataCellForTableColumn: (NSTableColumn *) tableColumn item: (id) item - (NSCell *) outlineView: (NSOutlineView *) outlineView dataCellForTableColumn: (NSTableColumn *) tableColumn item: (id) item
{ {
BOOL group = ![item isKindOfClass: [Torrent class]]; const BOOL group = ![item isKindOfClass: [Torrent class]];
if (!tableColumn) if (!tableColumn)
return !group ? fTorrentCell : nil; return !group ? fTorrentCell : nil;
else else