Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-04-18 07:56:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

add a string function to format an NSUInteger as a formatted string

Browse Source
This commit is contained in:
Mitchell Livingston
2010-11-14 20:26:58 +00:00
parent 69fcecce1a
commit c8ada6126c
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
macosx/Controller.m
View File

@@ -1785,15 +1785,11 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
- (void) setBottomCountText: (BOOL) filtering
{
NSNumberFormatter * numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
[numberFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
[numberFormatter setMaximumFractionDigits: 0];
NSString * totalTorrentsString;
NSUInteger totalCount = [fTorrents count];
if (totalCount != 1)
totalTorrentsString = [NSString stringWithFormat: NSLocalizedString(@"%@ transfers", "Status bar transfer count"),
[numberFormatter stringFromNumber: [NSNumber numberWithUnsignedInteger: totalCount]]];
[NSString formattedUInteger: totalCount]];
else
totalTorrentsString = NSLocalizedString(@"1 transfer", "Status bar transfer count");
@@ -1804,8 +1800,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
count -= [fDisplayedTorrents count];
totalTorrentsString = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@", "Status bar transfer count"),
[numberFormatter stringFromNumber: [NSNumber numberWithUnsignedInteger: count]],
totalTorrentsString];
[NSString formattedUInteger: count], totalTorrentsString];
}
[fTotalTorrentsField setStringValue: totalTorrentsString];

7
macosx/FilterButton.m
View File

@@ -23,6 +23,7 @@
*****************************************************************************/
#import "FilterButton.h"
#import "NSStringAdditions.h"
@implementation FilterButton
@@ -42,13 +43,9 @@
fCount = count;
NSNumberFormatter * numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
[numberFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
[numberFormatter setMaximumFractionDigits: 0];
[self setToolTip: fCount == 1 ? NSLocalizedString(@"1 transfer", "Filter Button -> tool tip")
: [NSString stringWithFormat: NSLocalizedString(@"%@ transfers", "Filter Bar Button -> tool tip"),
[numberFormatter stringFromNumber: [NSNumber numberWithUnsignedInteger: fCount]]]];
[NSString formattedUInteger: fCount]]];
}
@end

2
macosx/NSStringAdditions.h
View File

@@ -29,6 +29,8 @@
+ (NSString *) ellipsis;
- (NSString *) stringByAppendingEllipsis;
+ (NSString *) formattedUInteger: (NSUInteger) value;
+ (NSString *) stringForFileSize: (uint64_t) size;
+ (NSString *) stringForSpeed: (CGFloat) speed;

9
macosx/NSStringAdditions.m
View File

@@ -46,6 +46,15 @@
return [self stringByAppendingString: [NSString ellipsis]];
}
+ (NSString *) formattedUInteger: (NSUInteger) value
{
NSNumberFormatter * numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
[numberFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
[numberFormatter setMaximumFractionDigits: 0];
return [numberFormatter stringFromNumber: [NSNumber numberWithUnsignedInteger: value]];
}
+ (NSString *) stringForFileSize: (uint64_t) size
{
const CGFloat baseFloat = [NSApp isOnSnowLeopardOrBetter] ? 1000.0 : 1024.0;

6
macosx/PrefsController.m
View File

@@ -503,11 +503,7 @@ tr_session * fHandle;
if (exists)
{
NSNumberFormatter * numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
[numberFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
[numberFormatter setMaximumFractionDigits: 0];
NSString * countString = [numberFormatter stringFromNumber: [NSNumber numberWithInt: tr_blocklistGetRuleCount(fHandle)]];
NSString * countString = [NSString formattedUInteger: tr_blocklistGetRuleCount(fHandle)];
[fBlocklistMessageField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ IP address rules in list",
"Prefs -> blocklist -> message"), countString]];
}