mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-30 19:03:04 +00:00
Code Issues Releases Wiki Activity

Make context menu items enabled even if the window isn't active.

Browse source 
Also fixed a little spacing with the buttons.
This commit is contained in:
Mitchell Livingston 2006-06-10 03:21:36 +00:00
parent 243d5a58ef
commit ed904d154d
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
macosx/Controller.m
View file

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

10
macosx/TorrentTableView.m
View file

@ -28,12 +28,18 @@
#import "Utils.h"
#define BUTTON_WIDTH 14.0
#define BUTTON_TO_TOP 32.5
#define AREA_CENTER 23.0
#define BUTTON_TO_TOP 33.5
#define AREA_CENTER 21.0
#define DISTANCE_FROM_CENTER 2.5
@implementation TorrentTableView
- (void) awakeFromNib
{
[fContextRow setTitle: @"Context"];
[fContextNoRow setTitle: @"Context"];
}
- (void) setTorrents: (NSArray *) torrents
{
fTorrents = torrents;