Changeset 313

Timestamp:

Jun 10, 2006, 3:21:36 AM (17 years ago)

Author:

livings124

Message:

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

Also fixed a little spacing with the buttons.

Location:

trunk/macosx

Files:

• Controller.m (modified) (5 diffs)
• TorrentTableView.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -1141 +1141 @@
     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
@@ -1191 +1192 @@
     if (action == @selector(revealFile:))
     {
-        return canUseWindow && [fTableView numberOfSelectedRows] > 0;
+        return (canUseWindow || fromContext) && [fTableView numberOfSelectedRows] > 0;
     }
 
@@ -1225 +1226 @@
                             [title rangeOfString: NS_ELLIPSIS].location]];
         }
-        return canUseWindow && [fTableView numberOfSelectedRows] > 0;
+        return (canUseWindow || fromContext) && [fTableView numberOfSelectedRows] > 0;
     }
 
@@ -1231 +1232 @@
     if( action == @selector(stopTorrent:) )
     {
-        if (!canUseWindow)
+        if (!canUseWindow && !fromContext)
             return NO;
     
@@ -1250 +1251 @@
     if( action == @selector(resumeTorrent:) )
     {
-        if (!canUseWindow)
+        if (!canUseWindow && !fromContext)
             return NO;
     

trunk/macosx/TorrentTableView.m

@@ -29 +29 @@
 
 #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