Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-05-08 09:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

reset the message index when clearing the log

Browse Source
This commit is contained in:
Mitchell Livingston
2009-12-10 04:44:21 +00:00
parent 529dec7806
commit 3d30bb32d5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
macosx/MessageWindowController.h
+1
View File
@@ -32,6 +32,7 @@
IBOutlet NSButton * fSaveButton, * fClearButton; IBOutlet NSButton * fSaveButton, * fClearButton;
NSMutableArray * fMessages, * fDisplayedMessages; NSMutableArray * fMessages, * fDisplayedMessages;
NSUInteger fCurrentIndex;
NSDictionary * fAttributes; NSDictionary * fAttributes;
macosx/MessageWindowController.m
+3 -4
View File
@@ -153,12 +153,10 @@
if ((messages = tr_getQueuedMessages()) == NULL) if ((messages = tr_getQueuedMessages()) == NULL)
return; return;
static NSUInteger currentIndex = 0;
[fLock lock]; [fLock lock];
NSScroller * scroller = [[fMessageTable enclosingScrollView] verticalScroller]; NSScroller * scroller = [[fMessageTable enclosingScrollView] verticalScroller];
const BOOL shouldScroll = currentIndex == 0 || [scroller floatValue] == 1.0 || [scroller isHidden] const BOOL shouldScroll = fCurrentIndex == 0 || [scroller floatValue] == 1.0 || [scroller isHidden]
|| [scroller knobProportion] == 1.0; || [scroller knobProportion] == 1.0;
const NSInteger maxLevel = [[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"]; const NSInteger maxLevel = [[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"];
@@ -175,7 +173,7 @@
NSDictionary * message = [NSDictionary dictionaryWithObjectsAndKeys: NSDictionary * message = [NSDictionary dictionaryWithObjectsAndKeys:
[NSString stringWithUTF8String: currentMessage->message], @"Message", [NSString stringWithUTF8String: currentMessage->message], @"Message",
[NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date", [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
[NSNumber numberWithUnsignedInteger: currentIndex++], @"Index", //more accurate when sorting by date [NSNumber numberWithUnsignedInteger: fCurrentIndex++], @"Index", //more accurate when sorting by date
[NSNumber numberWithInteger: currentMessage->level], @"Level", [NSNumber numberWithInteger: currentMessage->level], @"Level",
name, @"Name", name, @"Name",
file, @"File", nil]; file, @"File", nil];
@@ -361,6 +359,7 @@
[fMessages removeAllObjects]; [fMessages removeAllObjects];
[fDisplayedMessages removeAllObjects]; [fDisplayedMessages removeAllObjects];
[fMessageTable reloadData]; [fMessageTable reloadData];
fCurrentIndex = 0;
[fLock unlock]; [fLock unlock];
} }
macosx/NSStringAdditions.m
+1 -1
View File
@@ -153,7 +153,7 @@
return [timeArray componentsJoinedByString: @" "]; return [timeArray componentsJoinedByString: @" "];
} }
//also used in InfoWindow.xib //also used in InfoWindow.xib and MessageWindow.xib
- (NSComparisonResult) compareFinder: (NSString *) string - (NSComparisonResult) compareFinder: (NSString *) string
{ {
if ([NSApp isOnSnowLeopardOrBetter]) if ([NSApp isOnSnowLeopardOrBetter])