Changeset 151

Timestamp:

Mar 12, 2006, 3:45:55 PM (17 years ago)

Author:

titer

Message:

Moved 'reveal in finder' to the Torrent class, and do it in a PathFinder?-
compatible way (fixes #6)

Location:

branches/new_api/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (2 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (1 diff)
• TorrentTableView.h (modified) (1 diff)
• TorrentTableView.m (modified) (3 diffs)

branches/new_api/macosx/Controller.h

@@ -127 +127 @@
 - (void) notifyGrowl:       (NSString *) file;
 - (void) revealFromMenu:    (id) sender;
-- (void) finderReveal:      (NSString *) path;
 - (void) finderTrash:       (NSString *) path;
 - (void) growlRegister:     (id) sender;

branches/new_api/macosx/Controller.m

@@ -88 +88 @@
     [fWindow setDelegate: self];
 
+    [fTableView setTorrents: fTorrents];
     [[fTableView tableColumnWithIdentifier: @"Torrent"] setDataCell:
         [[TorrentCell alloc] init]];
@@ -1105 +1106 @@
 - (void) revealFromMenu: (id) sender
 {
-#if 0
-    int row = [fTableView selectedRow];
-    if (row >= 0)
-    {
-        [self finderReveal: [NSString stringWithFormat: @"%@/%@",
-            [NSString stringWithUTF8String: fStat[row].folder],
-            [NSString stringWithUTF8String: fStat[row].info.name]]];
-    }
-#endif
-}
-
-- (void) finderReveal: (NSString *) path
-{
-    NSString * string;
-    NSAppleScript * appleScript;
-    NSDictionary * error;
-
-    string = [NSString stringWithFormat:
-        @"tell application \"Finder\"\n"
-         "  activate\n"
-         "  reveal (POSIX file \"%@\")\n"
-         "end tell", path];
-
-    appleScript = [[NSAppleScript alloc] initWithSource: string];
-    if( ![appleScript executeAndReturnError: &error] )
-    {
-        printf( "finderReveal failed\n" );
-    }
-    [appleScript release];
+    Torrent * torrent;
+    torrent = [fTorrents objectAtIndex: [fTableView selectedRow]];
+    [torrent reveal];
 }
 

branches/new_api/macosx/Torrent.h

@@ -49 +49 @@
 - (void)       sleep;
 - (void)       wakeUp;
+- (void)       reveal;
 
 - (NSImage *)  icon;

branches/new_api/macosx/Torrent.m

@@ -200 +200 @@
 }
 
+- (void) reveal
+{
+    NSString * path = [NSString stringWithFormat: @"%@/%@",
+                        [self getFolder], [self name]];
+    NSURL * url = [NSURL fileURLWithPath: path];
+
+    [[NSWorkspace sharedWorkspace] selectFile: [url path]
+        inFileViewerRootedAtPath: nil];
+}
+
 - (NSImage *) icon
 {

branches/new_api/macosx/TorrentTableView.h

@@ -7 +7 @@
 
 {
-    IBOutlet Controller  * fController;
+    IBOutlet Controller * fController;
+    NSArray             * fTorrents;
 
-    NSPoint                fClickPoint;
+    NSPoint               fClickPoint;
     
     IBOutlet NSMenu     * fContextRow;
     IBOutlet NSMenu     * fContextNoRow;
 }
+- (void) setTorrents: (NSArray *) torrents;
 
 @end

branches/new_api/macosx/TorrentTableView.m

@@ -23 +23 @@
 #import "TorrentTableView.h"
 #import "Controller.h"
+#import "Torrent.h"
 
 @implementation TorrentTableView
+
+- (void) setTorrents: (NSArray *) torrents
+{
+    fTorrents = torrents;
+}
 
 - (void) pauseOrResume: (int) row
@@ -89 +95 @@
     NSPoint point;
     int row, col;
+    Torrent * torrent;
 
     point = [self convertPoint: [e locationInWindow] fromView: NULL];
@@ -104 +111 @@
     else if( [self pointInRevealRect: point] )
     {
-#if 0
-        [fController finderReveal: [NSString stringWithFormat:
-            @"%@/%@", [NSString stringWithUTF8String: fStat[row].folder],
-            [NSString stringWithUTF8String: fStat[row].info.name]]];
+        torrent = [fTorrents objectAtIndex: row];
+        [torrent reveal];
         [self display];
-#endif
     }
     else if( row >= 0 && ( [e modifierFlags] & NSAlternateKeyMask ) )