mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Having two booleans was redundant.

This commit is contained in:
Mitchell Livingston 2006-06-10 04:12:40 +00:00
parent 01474a00d1
commit 14a5854dec
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
macosx/Controller.m
View File

@ -1140,9 +1140,9 @@ static void sleepCallBack( void * controller, io_service_t y,
{ {
SEL action = [menuItem action]; SEL action = [menuItem action];
//only enable some items if the window is useable or it is in a context menu //only enable some items if it is in a context menu or the window is useable
BOOL canUseWindow = [fWindow isKeyWindow] && ![fToolbar customizationPaletteIsRunning]; BOOL canUseMenu = [[[menuItem menu] title] isEqualToString: @"Context"]
BOOL fromContext = [[[menuItem menu] title] isEqualToString: @"Context"]; || ([fWindow isKeyWindow] && ![fToolbar customizationPaletteIsRunning]);
//enable show info //enable show info
if (action == @selector(showInfo:)) if (action == @selector(showInfo:))
@ -1164,7 +1164,7 @@ static void sleepCallBack( void * controller, io_service_t y,
if (![[menuItem title] isEqualToString: title]) if (![[menuItem title] isEqualToString: title])
[menuItem setTitle: title]; [menuItem setTitle: title];
return canUseWindow; return canUseMenu;
} }
//enable resume all item //enable resume all item
@ -1191,7 +1191,7 @@ static void sleepCallBack( void * controller, io_service_t y,
if (action == @selector(revealFile:)) if (action == @selector(revealFile:))
{ {
return (canUseWindow || fromContext) && [fTableView numberOfSelectedRows] > 0; return canUseMenu && [fTableView numberOfSelectedRows] > 0;
} }
//enable remove items //enable remove items
@ -1225,13 +1225,13 @@ static void sleepCallBack( void * controller, io_service_t y,
[menuItem setTitle: [title substringToIndex: [menuItem setTitle: [title substringToIndex:
[title rangeOfString: NS_ELLIPSIS].location]]; [title rangeOfString: NS_ELLIPSIS].location]];
} }
return (canUseWindow || fromContext) && [fTableView numberOfSelectedRows] > 0; return canUseMenu && [fTableView numberOfSelectedRows] > 0;
} }
//enable pause item //enable pause item
if( action == @selector(stopTorrent:) ) if( action == @selector(stopTorrent:) )
{ {
if (!canUseWindow && !fromContext) if (!canUseMenu)
return NO; return NO;
Torrent * torrent; Torrent * torrent;
@ -1250,7 +1250,7 @@ static void sleepCallBack( void * controller, io_service_t y,
//enable resume item //enable resume item
if( action == @selector(resumeTorrent:) ) if( action == @selector(resumeTorrent:) )
{ {
if (!canUseWindow && !fromContext) if (!canUseMenu)
return NO; return NO;
Torrent * torrent; Torrent * torrent;
@ -1268,7 +1268,7 @@ static void sleepCallBack( void * controller, io_service_t y,
//enable resume item //enable resume item
if (action == @selector(setSort:) || (action == @selector(advancedChanged:))) if (action == @selector(setSort:) || (action == @selector(advancedChanged:)))
return canUseWindow; return canUseMenu;
return YES; return YES;
} }