Changeset 5049
- Timestamp:
- Feb 16, 2008, 7:32:22 PM (13 years ago)
- Location:
- trunk/macosx
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/Torrent.h
r4930 r5049 57 57 NSImage * fIcon; 58 58 59 NSString * f HashString;59 NSString * fNameString, * fHashString; 60 60 61 61 tr_file_stat * fileStat; -
trunk/macosx/Torrent.m
r5035 r5049 176 176 [fFinishedPiecesDate release]; 177 177 178 [fNameString release]; 178 179 [fHashString release]; 179 180 … … 661 662 - (NSString *) name 662 663 { 663 return [NSString stringWithUTF8String: fInfo->name];664 return fNameString; 664 665 } 665 666 … … 709 710 - (NSString *) comment 710 711 { 711 return fInfo->comment != NULL ? [NSString stringWithUTF8String: fInfo->comment] : @"";712 return [NSString stringWithUTF8String: fInfo->comment]; 712 713 } 713 714 714 715 - (NSString *) creator 715 716 { 716 return fInfo->creator != NULL ? [NSString stringWithUTF8String: fInfo->creator] : @"";717 return [NSString stringWithUTF8String: fInfo->creator]; 717 718 } 718 719 … … 1086 1087 - (NSString *) remainingTimeString 1087 1088 { 1088 switch (fStat->status) 1089 { 1090 case TR_STATUS_DOWNLOAD: 1091 return [self eta] >= 0 ? [self etaString: [self eta]] : NSLocalizedString(@"Unknown", "Torrent -> remaining time"); 1092 1093 case TR_STATUS_SEED: 1094 case TR_STATUS_DONE: 1095 return [NSLocalizedString(@"Ratio: ", "Torrent -> status string") stringByAppendingString: 1096 [NSString stringForRatio: [self ratio]]]; 1097 1098 default: 1099 return [self shortStatusString]; 1100 } 1089 if (![self isActive] || ([self isSeeding] 1090 && !(fRatioSetting == NSOnState || (fRatioSetting == NSMixedState && [fDefaults boolForKey: @"RatioCheck"])))) 1091 return [self shortStatusString]; 1092 1093 int eta = fStat->status == TR_STATUS_DOWNLOAD ? [self eta] : [self etaRatio]; 1094 return eta >= 0 ? [self etaString: eta] : NSLocalizedString(@"Unknown", "Torrent -> remaining time"); 1101 1095 } 1102 1096 … … 1575 1569 fInfo = tr_torrentInfo(fHandle); 1576 1570 1571 fNameString = [[NSString alloc] initWithUTF8String: fInfo->name]; 1577 1572 fHashString = [[NSString alloc] initWithUTF8String: fInfo->hashString]; 1578 1573 … … 1713 1708 case TR_CP_COMPLETE: 1714 1709 canMove = YES; 1715 1710 1716 1711 //move file from incomplete folder to download folder 1717 1712 if (fUseIncompleteFolder && ![[self downloadFolder] isEqualToString: fDownloadFolder]
Note: See TracChangeset
for help on using the changeset viewer.