adium 2125:8a5ec2b99e63: D'oh, unset the key equivalent when not...

commits at adium.im commits at adium.im
Fri May 8 00:24:40 UTC 2009


details:	http://hg.adium.im/adium/rev/8a5ec2b99e63
revision:	2125:8a5ec2b99e63
author:		Zachary West <zacw at adium.im>
date:		Thu May 07 20:24:31 2009 -0400

D'oh, unset the key equivalent when not selected. Clear the selection when removing a FT.

diffstat:

 Source/ESFileTransferProgressView.m             |  4 +++-
 Source/ESFileTransferProgressWindowController.m |  5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 002aa3796660 -r 8a5ec2b99e63 Source/ESFileTransferProgressView.m
--- a/Source/ESFileTransferProgressView.m	Thu May 07 20:18:30 2009 -0400
+++ b/Source/ESFileTransferProgressView.m	Thu May 07 20:24:31 2009 -0400
@@ -341,7 +341,7 @@
 
 			[button_stopResume setAlternateImage:[NSImage imageNamed:@"FTProgressResendPressed" forClass:[self class]]];
 		}
-	} else {		
+	} else {	
 		if (isSelected) {
 			[button_stopResume setKeyEquivalent:@"."];
 			[button_stopResume setKeyEquivalentModifierMask:NSCommandKeyMask];
@@ -352,6 +352,8 @@
 			[button_stopResume setAlternateImage:[NSImage imageNamed:@"FTProgressStopPressed_Selected" forClass:[self class]]];
 
 		} else {
+			[button_stopResume setKeyEquivalent:@""];
+			
 			[button_stopResume setImage:[NSImage imageNamed:(buttonStopResumeIsHovered ? @"FTProgressStopRollover" : @"FTProgressStop")
 													forClass:[self class]]];
 
diff -r 002aa3796660 -r 8a5ec2b99e63 Source/ESFileTransferProgressWindowController.m
--- a/Source/ESFileTransferProgressWindowController.m	Thu May 07 20:18:30 2009 -0400
+++ b/Source/ESFileTransferProgressWindowController.m	Thu May 07 20:24:31 2009 -0400
@@ -466,8 +466,11 @@
 	}
 
 	//If they tried to delete a row that isn't finished, or we got here with no valid selection, sound the system beep
-	if (!didDelete)
+	if (!didDelete) {
 		NSBeep();
+	} else {
+		[inOutlineView deselectAll:nil];
+	}
 }
 
 - (NSMenu *)outlineView:(NSOutlineView *)inOutlineView menuForEvent:(NSEvent *)inEvent




More information about the commits mailing list