mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-10 14:13:23 +00:00
Code Issues Releases Wiki Activity

trivial cleanup to the message window: set the pulldown's images in the xib, use NSInteger instead of int (same for unsigned), and don't bother storing the dot images as instance variables

Browse source
This commit is contained in:
Mitchell Livingston 2009-10-11 16:25:07 +00:00
parent 264774859f
commit 1172f62803
3 changed files with 963 additions and 1491 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2425
macosx/MessageWindow.xib
View file

File diff suppressed because it is too large Load diff

2
macosx/MessageWindowController.h
View file

@ -37,8 +37,6 @@
NSDictionary * fAttributes;
NSTimer * fTimer;
NSImage * fErrorImage, * fInfoImage, * fDebugImage;
}
- (void) updateLog: (NSTimer *) timer;

27
macosx/MessageWindowController.m
View file

@ -73,18 +73,11 @@
[fMessageTable setSortDescriptors: [NSArray arrayWithObject: [[fMessageTable tableColumnWithIdentifier: @"Date"]
sortDescriptorPrototype]]];
fErrorImage = [NSImage imageNamed: @"RedDot.png"];
fInfoImage = [NSImage imageNamed: @"YellowDot.png"];
fDebugImage = [NSImage imageNamed: @"PurpleDot.png"];
[[self window] setTitle: NSLocalizedString(@"Message Log", "Message window -> title")];
//set images and text for popup button items
[[fLevelButton itemAtIndex: LEVEL_ERROR] setImage: fErrorImage];
[[fLevelButton itemAtIndex: LEVEL_ERROR] setTitle: NSLocalizedString(@"Error", "Message window -> level string")];
[[fLevelButton itemAtIndex: LEVEL_INFO] setImage: fInfoImage];
[[fLevelButton itemAtIndex: LEVEL_INFO] setTitle: NSLocalizedString(@"Info", "Message window -> level string")];
[[fLevelButton itemAtIndex: LEVEL_DEBUG] setImage: fDebugImage];
[[fLevelButton itemAtIndex: LEVEL_DEBUG] setTitle: NSLocalizedString(@"Debug", "Message window -> level string")];
//set table column text
@ -158,11 +151,11 @@
NSDictionary * message = [NSDictionary dictionaryWithObjectsAndKeys:
[NSString stringWithUTF8String: currentMessage->message], @"Message",
[NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
[NSNumber numberWithUnsignedInt: fIndex++], @"Index", //more accurate when sorting by date
[NSNumber numberWithInt: currentMessage->level], @"Level",
[NSNumber numberWithUnsignedInteger: fIndex++], @"Index", //more accurate when sorting by date
[NSNumber numberWithInteger: currentMessage->level], @"Level",
name, @"Name",
[NSString stringWithUTF8String: currentMessage->file], @"File",
[NSNumber numberWithInt: currentMessage->line], @"Line", nil];
[NSNumber numberWithInteger: currentMessage->line], @"Line", nil];
[fMessages addObject: message];
}
@ -206,15 +199,17 @@
return [message objectForKey: @"Date"];
else if ([ident isEqualToString: @"Level"])
{
switch ([[message objectForKey: @"Level"] intValue])
const NSInteger level = [[message objectForKey: @"Level"] integerValue];
switch (level)
{
case TR_MSG_ERR:
return fErrorImage;
return [NSImage imageNamed: @"RedDot.png"];
case TR_MSG_INF:
return fInfoImage;
return [NSImage imageNamed: @"YellowDot.png"];
case TR_MSG_DBG:
return fDebugImage;
return [NSImage imageNamed: @"PurpleDot.png"];
default:
NSAssert1(NO, @"Unknown message log level: %d", level);
return nil;
}
}
@ -278,7 +273,7 @@
{
[self updateLog: nil];
int level;
NSInteger level;
switch ([fLevelButton indexOfSelectedItem])
{
case LEVEL_ERROR:
@ -361,7 +356,7 @@
- (NSString *) stringForMessage: (NSDictionary *) message
{
NSString * level;
switch ([[message objectForKey: @"Level"] intValue])
switch ([[message objectForKey: @"Level"] integerValue])
{
case TR_MSG_ERR:
level = NSLocalizedString(@"Error", "Message window -> level");