Changeset 9228

Timestamp:

Oct 1, 2009, 2:24:58 AM (13 years ago)

Author:

livings124

Message:

allowing pasting into the tracker table on 10.5

File:

• trunk/macosx/TrackerTableView.m (modified) (4 diffs)

trunk/macosx/TrackerTableView.m

@@ -80 +80 @@
 - (void) paste: (id) sender
 {
-    if (!fTorrent)
-        return;
+    NSAssert(fTorrent != nil, @"no torrent but trying to paste; should not be able to call this method");
+    
+    BOOL added = NO;
     
     if ([NSApp isOnSnowLeopardOrBetter])
@@ -89 +90 @@
         NSAssert(items != nil, @"no string items to paste; should not be able to call this method");
         
-        BOOL added = NO;
         for (NSString * pbItem in items)
         {
@@ -96 +96 @@
                     added = YES;
         }
-        
-        //none added
-        if (!added)
-            NSBeep();
-    }
+    }
+    else
+    {
+        NSString * pbItem =[[NSPasteboard generalPasteboard] stringForType: NSStringPboardType];
+        NSAssert(pbItem != nil, @"no string items to paste; should not be able to call this method");
+        
+        for (NSString * item in [pbItem componentsSeparatedByString: @"\n"])
+            if ([fTorrent addTrackerToNewTier: item])
+                added = YES;
+    }
+    
+    //none added
+    if (!added)
+        NSBeep();
 }
 
@@ -111 +120 @@
     
     if (action == @selector(paste:))
-        return [[NSPasteboard generalPasteboard] canReadObjectForClasses: [NSArray arrayWithObject: [NSString class]] options: nil];
+    {
+        return fTorrent && ([NSApp isOnSnowLeopardOrBetter]
+                ? [[NSPasteboard generalPasteboard] canReadObjectForClasses: [NSArray arrayWithObject: [NSString class]] options: nil]
+                : [[NSPasteboard generalPasteboard] availableTypeFromArray: [NSArray arrayWithObject: NSStringPboardType]] != nil);
+    }
     
     return YES;