Changeset 14218

Timestamp:

Jan 9, 2014, 4:23:54 PM (9 years ago)

Author:

livings124

Message:

#5576 Share Button (to iMessage, email, etc) for torrent file

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/Controller.h (modified) (2 diffs)
• macosx/Controller.m (modified) (7 diffs)
• macosx/ShareToolbarItem.h (added)
• macosx/ShareToolbarItem.m (added)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -127 +127 @@
                 A222E9870E6B21D9009FB003 /* BlocklistDownloaderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A222E9860E6B21D9009FB003 /* BlocklistDownloaderViewController.m */; };
                 A222EA7B0E6C32C4009FB003 /* BlocklistScheduler.m in Sources */ = {isa = PBXBuildFile; fileRef = A222EA7A0E6C32C4009FB003 /* BlocklistScheduler.m */; };
+                A225A4C0187E369C00CDE823 /* ShareToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A225A4BF187E369C00CDE823 /* ShareToolbarItem.m */; };
                 A2265F420B5EF5F40093DDA5 /* FileNameCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A2265F400B5EF5F40093DDA5 /* FileNameCell.m */; };
                 A226FDAC0D0CDF20005A7F71 /* libnatpmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C7A118D0D0B2EB800B5701F /* libnatpmp.a */; };
@@ -745 +746 @@
                 A223AA810D220CEB00840069 /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = macosx/nl.lproj/MainMenu.xib; sourceTree = "<group>"; };
                 A223AA830D220CEB00840069 /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = macosx/nl.lproj/PrefsWindow.xib; sourceTree = "<group>"; };
+                A225A4BE187E369C00CDE823 /* ShareToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShareToolbarItem.h; path = macosx/ShareToolbarItem.h; sourceTree = "<group>"; };
+                A225A4BF187E369C00CDE823 /* ShareToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ShareToolbarItem.m; path = macosx/ShareToolbarItem.m; sourceTree = "<group>"; };
                 A2265F3F0B5EF5F40093DDA5 /* FileNameCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileNameCell.h; path = macosx/FileNameCell.h; sourceTree = "<group>"; };
                 A2265F400B5EF5F40093DDA5 /* FileNameCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileNameCell.m; path = macosx/FileNameCell.m; sourceTree = "<group>"; };
@@ -1394 +1397 @@
                                 A2C89D5F0CFCBF57004CC2BC /* ButtonToolbarItem.m */,
                                 A28E1DDF0CFFD8EC00E16385 /* ButtonToolbarItem.h */,
+                                A225A4BE187E369C00CDE823 /* ShareToolbarItem.h */,
+                                A225A4BF187E369C00CDE823 /* ShareToolbarItem.m */,
                                 A21979890D07B78400438EA7 /* GroupToolbarItem.h */,
                                 A219798A0D07B78400438EA7 /* GroupToolbarItem.m */,
@@ -2720 +2725 @@
                         buildActionMask = 2147483647;
                         files = (
+                                A225A4C0187E369C00CDE823 /* ShareToolbarItem.m in Sources */,
                                 A2D77453154CC72B00A62B93 /* WebSeedTableView.m in Sources */,
                                 8D11072D0486CEB800E47090 /* main.m in Sources */,

trunk/macosx/Controller.h

@@ -51 +51 @@
 } addType;
 
-@interface Controller : NSObject <GrowlApplicationBridgeDelegate, NSURLDownloadDelegate, NSUserNotificationCenterDelegate, NSPopoverDelegate, NSSoundDelegate, NSToolbarDelegate, NSWindowDelegate, QLPreviewPanelDataSource, QLPreviewPanelDelegate, VDKQueueDelegate>
+@interface Controller : NSObject <GrowlApplicationBridgeDelegate, NSURLDownloadDelegate, NSUserNotificationCenterDelegate, NSPopoverDelegate, NSSharingServiceDelegate, NSSharingServicePickerDelegate, NSSoundDelegate, NSToolbarDelegate, NSWindowDelegate, QLPreviewPanelDataSource, QLPreviewPanelDelegate, VDKQueueDelegate>
 {
     tr_session                      * fLib;
@@ -180 +180 @@
 - (void) verifySelectedTorrents: (id) sender;
 - (void) verifyTorrents: (NSArray *) torrents;
+
+- (NSArray *)selectedTorrents;
 
 @property (retain, readonly) PrefsController * prefsController;

trunk/macosx/Controller.m

@@ -45 +45 @@
 #import "ButtonToolbarItem.h"
 #import "GroupToolbarItem.h"
+#import "ShareToolbarItem.h"
 #import "ToolbarSegmentedCell.h"
 #import "BlocklistDownloader.h"
@@ -79 +80 @@
 #define TOOLBAR_FILTER                  @"Toolbar Toggle Filter"
 #define TOOLBAR_QUICKLOOK               @"Toolbar QuickLook"
+#define TOOLBAR_SHARE                   @"Toolbar Share"
 
 typedef enum
@@ -1782 +1784 @@
     
     [self applyFilter];
+}
+
+- (NSArray *)selectedTorrents
+{
+    return [fTableView selectedTorrents];
 }
 
@@ -3805 +3812 @@
 }
 
+- (void) showToolbarShare: (id) sender
+{
+    NSParameterAssert([sender isKindOfClass:[NSButton class]]);
+    
+    NSSharingServicePicker * picker = [[NSSharingServicePicker alloc] initWithItems: [ShareToolbarItem shareTorrentURLs]];
+    picker.delegate = self;
+    
+    [picker showRelativeToRect:[sender bounds] ofView:sender preferredEdge:NSMinYEdge];
+}
+
+- (id<NSSharingServiceDelegate>)sharingServicePicker:(NSSharingServicePicker *)sharingServicePicker delegateForSharingService:(NSSharingService *)sharingService
+{
+    return self;
+}
+
+- (NSWindow *)sharingService:(NSSharingService *)sharingService sourceWindowForShareItems:(NSArray *)items sharingContentScope:(NSSharingContentScope *)sharingContentScope
+{
+    return fWindow;
+}
+
 - (ButtonToolbarItem *) standardToolbarButtonWithIdentifier: (NSString *) ident
 {
-    ButtonToolbarItem * item = [[ButtonToolbarItem alloc] initWithItemIdentifier: ident];
+    return [self toolbarButtonWithIdentifier: ident forToolbarButtonClass: [ButtonToolbarItem class]];
+}
+
+- (id) toolbarButtonWithIdentifier: (NSString *) ident forToolbarButtonClass:(Class)class
+{
+    ButtonToolbarItem * item = [[class alloc] initWithItemIdentifier: ident];
     
     NSButton * button = [[NSButton alloc] init];
@@ -4008 +4040 @@
         return item;
     }
+    else if ([ident isEqualToString: TOOLBAR_SHARE])
+    {
+        ShareToolbarItem * item = [self toolbarButtonWithIdentifier: ident forToolbarButtonClass: [ShareToolbarItem class]];
+        
+        [item setLabel: NSLocalizedString(@"Share", "Share toolbar item -> label")];
+        [item setPaletteLabel: NSLocalizedString(@"Share", "Share toolbar item -> palette label")];
+        [item setToolTip: NSLocalizedString(@"Share torrent file", "Share toolbar item -> tooltip")];
+        [item setImage: [NSImage imageNamed: NSImageNameShareTemplate]];
+        [item setVisibilityPriority: NSToolbarItemVisibilityPriorityLow];
+        
+        NSButton *itemButton = (NSButton *)[item view];
+        [itemButton setTarget: self];
+        [itemButton setAction: @selector(showToolbarShare:)];
+        [itemButton sendActionOn:NSLeftMouseDownMask];
+        
+        return item;
+    }
     else
         return nil;
@@ -4044 +4093 @@
 - (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
 {
-    return [NSArray arrayWithObjects:
-            TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_OPEN_WEB, TOOLBAR_REMOVE,
-            TOOLBAR_PAUSE_RESUME_SELECTED, TOOLBAR_PAUSE_RESUME_ALL,
-            TOOLBAR_QUICKLOOK, TOOLBAR_FILTER, TOOLBAR_INFO,
-            NSToolbarSeparatorItemIdentifier,
-            NSToolbarSpaceItemIdentifier,
-            NSToolbarFlexibleSpaceItemIdentifier,
-            NSToolbarCustomizeToolbarItemIdentifier, nil];
+    NSMutableArray *items = [NSMutableArray arrayWithObjects:
+                             TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_OPEN_WEB, TOOLBAR_REMOVE,
+                             TOOLBAR_PAUSE_RESUME_SELECTED, TOOLBAR_PAUSE_RESUME_ALL,
+                             TOOLBAR_SHARE, TOOLBAR_QUICKLOOK, TOOLBAR_FILTER, TOOLBAR_INFO,
+                             NSToolbarSeparatorItemIdentifier,
+                             NSToolbarSpaceItemIdentifier,
+                             NSToolbarFlexibleSpaceItemIdentifier,
+                             NSToolbarCustomizeToolbarItemIdentifier, nil];
+    if (![NSApp isOnMountainLionOrBetter]) {
+        [items removeObject:TOOLBAR_SHARE];
+    }
+    return items;
 }
 
 - (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar
 {
-    return [NSArray arrayWithObjects:
-            TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_REMOVE, NSToolbarSpaceItemIdentifier,
-            TOOLBAR_PAUSE_RESUME_ALL, NSToolbarFlexibleSpaceItemIdentifier,
-            TOOLBAR_QUICKLOOK, TOOLBAR_FILTER, TOOLBAR_INFO, nil];
+    NSMutableArray *items = [NSMutableArray arrayWithObjects:
+                             TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_REMOVE, NSToolbarSpaceItemIdentifier,
+                             TOOLBAR_PAUSE_RESUME_ALL, NSToolbarFlexibleSpaceItemIdentifier,
+                             TOOLBAR_SHARE, TOOLBAR_QUICKLOOK, TOOLBAR_FILTER, TOOLBAR_INFO, nil];
+    if (![NSApp isOnMountainLionOrBetter]) {
+        [items removeObject:TOOLBAR_SHARE];
+    }
+    return items;
 }
 
@@ -4126 +4183 @@
         return YES;
     }
-
+    
+    //enable share item
+    if ([ident isEqualToString: TOOLBAR_SHARE])
+        return [fTableView numberOfSelectedRows] > 0;
+    
     return YES;
 }