Changeset 594

Timestamp:

Jul 15, 2006, 11:13:21 PM (16 years ago)

Author:

livings124

Message:

Use Growl framework rather than applescript.

Location:

trunk

Files:

• Growl.framework (added)
• Growl.framework/Growl (added)
• Growl.framework/Headers (added)
• Growl.framework/Resources (added)
• Growl.framework/Versions (added)
• Growl.framework/Versions/A (added)
• Growl.framework/Versions/A/Growl (added)
• Growl.framework/Versions/A/Headers (added)
• Growl.framework/Versions/A/Headers/Growl.h (added)
• Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h (added)
• Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h (added)
• Growl.framework/Versions/A/Headers/GrowlDefines.h (added)
• Growl.framework/Versions/A/Resources (added)
• Growl.framework/Versions/A/Resources/Info.plist (added)
• Growl.framework/Versions/Current (added)
• Transmission.xcodeproj/project.pbxproj (modified) (7 diffs)
• macosx/Controller.h (modified) (3 diffs)
• macosx/Controller.m (modified) (8 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -110 +110 @@
                 A25FCDEF0A3769A6002BCBBE /* PauseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = A25FCDDD0A37695F002BCBBE /* PauseSelected.png */; };
                 A25FCDF00A3769AC002BCBBE /* ResumeSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */; };
+                A261F1DC0A69A1610002815A /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A261F1DB0A69A1610002815A /* Growl.framework */; };
+                A261F1E40A69A1B10002815A /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A261F1DB0A69A1610002815A /* Growl.framework */; };
                 A26D450B0A0503AC00A10BB3 /* peermessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1838A309DEC0430047D688 /* peermessages.h */; };
                 A27431DB0A68538400FA780A /* BarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A27431D90A68538400FA780A /* BarButton.m */; };
@@ -152 +154 @@
                         dstSubfolderSpec = 10;
                         files = (
+                                A261F1E40A69A1B10002815A /* Growl.framework in CopyFiles */,
                                 A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */,
                         );
@@ -250 +253 @@
                 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentCell.m; path = macosx/TorrentCell.m; sourceTree = "<group>"; };
                 4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentCell.h; path = macosx/TorrentCell.h; sourceTree = "<group>"; };
-                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
+                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
                 4DDBB71B09E16BF100284745 /* transmissioncli.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = transmissioncli.c; path = cli/transmissioncli.c; sourceTree = "<group>"; };
                 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownloadBadge.png; path = macosx/Images/DownloadBadge.png; sourceTree = "<group>"; };
@@ -306 +309 @@
                 A25FCDDD0A37695F002BCBBE /* PauseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseSelected.png; path = macosx/Images/PauseSelected.png; sourceTree = "<group>"; };
                 A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeSelected.png; path = macosx/Images/ResumeSelected.png; sourceTree = "<group>"; };
+                A261F1DB0A69A1610002815A /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Growl.framework; sourceTree = "<group>"; };
                 A27431D80A68538400FA780A /* BarButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BarButton.h; path = macosx/BarButton.h; sourceTree = "<group>"; };
                 A27431D90A68538400FA780A /* BarButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = BarButton.m; path = macosx/BarButton.m; sourceTree = "<group>"; };
@@ -352 +356 @@
                                 4D4B7F6109E055660053C1EB /* libcrypto.0.9.dylib in Frameworks */,
                                 A24F19080A3A790800C9C145 /* Sparkle.framework in Frameworks */,
+                                A261F1DC0A69A1610002815A /* Growl.framework in Frameworks */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -568 +573 @@
                         isa = PBXGroup;
                         children = (
+                                A261F1DB0A69A1610002815A /* Growl.framework */,
                                 A24F19070A3A790800C9C145 /* Sparkle.framework */,
                         );
@@ -896 +902 @@
                                         "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
                                         "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
+                                        "$(FRAMEWORK_SEARCH_PATHS_QUOTED_3)",
                                 );
                                 FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
                                 FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)\"";
+                                FRAMEWORK_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)\"";
                                 GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                 GCC_PREFIX_HEADER = macosx/Transmission_Prefix.pch;

trunk/macosx/Controller.h

@@ -84 +84 @@
     NSMutableArray              * fAutoImportedNames;
     
-    BOOL                        fHasGrowl, fUpdateInProgress;
+    BOOL                        fUpdateInProgress;
     Badger                      * fBadger;
 }
 
 - (void) openShowSheet:   (id) sender;
-- (void) openSheetClosed: (NSOpenPanel *) s returnCode: (int) code
-                        contextInfo: (void *) info;
+- (void) openSheetClosed: (NSOpenPanel *) s returnCode: (int) code contextInfo: (void *) info;
 
-- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode
-                            contextInfo: (void *) contextInfo;
+- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo;
 
 - (NSArray *) torrentsAtIndexes: (NSIndexSet *) indexSet;
@@ -162 +160 @@
 - (void) autoImportChange: (NSNotification *) notification;
 
-- (void) sleepCallBack: (natural_t) messageType argument:
-                        (void *) messageArgument;
+- (void) sleepCallBack: (natural_t) messageType argument: (void *) messageArgument;
 
 - (void) toggleSmallView: (id) sender;
@@ -178 +175 @@
 - (void) linkForums:        (id) sender;
 
-- (void) notifyGrowl: (NSString *) title message: (NSString *) message identifier: (NSString *) ident;
-- (void) growlRegister;
-
 - (void) checkUpdate:       (id) sender;
 - (void) prepareForUpdate:  (NSNotification *) notification;

trunk/macosx/Controller.m

@@ -32 +32 @@
 
 #import <Sparkle/Sparkle.h>
+#import <Growl/GrowlApplicationBridge.h>
 
 #define TOOLBAR_OPEN            @"Toolbar Open"
@@ -49 +50 @@
 #define FORUM_URL   @"http://transmission.m0k.org/forum/"
 
-#define GROWL_PATH  @"/Library/PreferencePanes/Growl.prefPane/Contents/Resources/GrowlHelperApp.app"
-
 static void sleepCallBack(void * controller, io_service_t y,
         natural_t messageType, void * messageArgument)
@@ -75 +74 @@
         fBadger = [[Badger alloc] init];
         
-        //check and register Growl if it is installed for this user or all users
-        NSFileManager * manager = [NSFileManager defaultManager];
-        fHasGrowl = [manager fileExistsAtPath: GROWL_PATH]
-            || [manager fileExistsAtPath: [NSHomeDirectory() stringByAppendingPathComponent: GROWL_PATH]];
-        [self growlRegister];
+        [GrowlApplicationBridge setGrowlDelegate: self];
     }
     return self;
@@ -833 +828 @@
             [self checkToStartWaiting: torrent];
         
-            //notifications
-            [self notifyGrowl: @"Download Complete" message: [[torrent name] stringByAppendingString:
-                                            @" finished downloading"] identifier: @"Download Complete"];
+            [GrowlApplicationBridge notifyWithTitle: @"Download Complete"
+                description: [torrent name] notificationName: @"Download Complete" iconData: nil
+                priority: 0 isSticky: NO clickContext: nil];
+
             if (![fWindow isKeyWindow])
                 fCompleted++;
@@ -1223 +1219 @@
     [fInfoController updateInfoStatsAndSettings];
     
-    [self notifyGrowl: @"Seeding Complete" message: [[[notification object] name] stringByAppendingString:
-                                                        @" finished seeding"] identifier: @"Seeding Complete"];
+    [GrowlApplicationBridge notifyWithTitle: @"Seeding Complete"
+                description: [[notification object] name] notificationName: @"Seeding Complete"
+                iconData: nil priority: 0 isSticky: NO clickContext: nil];
 }
 
@@ -1331 +1328 @@
             //import only actually happened if the torrent array is larger
             if (oldCount < [fTorrents count])
-                [self notifyGrowl: @"Torrent File Auto Added" message: [file stringByAppendingString:
-                                                    @" added to Transmission"] identifier: @"Torrent Auto Added"];
+                [GrowlApplicationBridge notifyWithTitle: @"Torrent File Auto Added"
+                    description: file notificationName: @"Torrent Auto Added" iconData: nil
+                    priority: 0 isSticky: NO clickContext: nil];
         }
 }
@@ -1991 +1989 @@
 }
 
-- (void) notifyGrowl: (NSString *) title message: (NSString *) message identifier: (NSString *) ident
-{
-    if (!fHasGrowl)
-        return;
-
-    NSString * growlScript = [NSString stringWithFormat:
-        @"tell application \"System Events\"\n"
-         "  if exists application process \"GrowlHelperApp\" then\n"
-         "    tell application \"GrowlHelperApp\"\n "
-         "      notify with name \"%@\""
-         "        title \"%@\""
-         "        description \"%@\""
-         "        application name \"Transmission\"\n"
-         "    end tell\n"
-         "  end if\n"
-         "end tell", ident, title, message];
-    
-    NSAppleScript * appleScript = [[NSAppleScript alloc] initWithSource: growlScript];
-    NSDictionary * error;
-    if (![appleScript executeAndReturnError: & error])
-        NSLog(@"Growl notify failed");
-    [appleScript release];
-}
-
-- (void) growlRegister
-{
-    if (!fHasGrowl)
-        return;
-
-    NSString * growlScript = @"tell application \"System Events\"\n"
-         "  if exists application process \"GrowlHelperApp\" then\n"
-         "    tell application \"GrowlHelperApp\"\n"
-         "      register as application \"Transmission\" "
-         "        all notifications {\"Download Complete\", \"Seeding Complete\", \"Torrent Auto Added\"}"
-         "        default notifications {\"Download Complete\", \"Seeding Complete\", \"Torrent Auto Added\"}"
-         "        icon of application \"Transmission\"\n"
-         "    end tell\n"
-         "  end if\n"
-         "end tell";
-
-    NSAppleScript * appleScript = [[NSAppleScript alloc] initWithSource: growlScript];
-    NSDictionary * error;
-    if (![appleScript executeAndReturnError: & error])
-        NSLog(@"Growl registration failed");
-    [appleScript release];
-}
-
 - (void) checkUpdate: (id) sender
 {
@@ -2048 +1999 @@
 }
 
+- (NSDictionary *) registrationDictionaryForGrowl
+{
+    NSArray * notifications = [NSArray arrayWithObjects: @"Download Complete",
+                                @"Seeding Complete", @"Torrent Auto Added", nil];
+    return [NSDictionary dictionaryWithObjectsAndKeys: notifications, GROWL_NOTIFICATIONS_ALL,
+                                notifications, GROWL_NOTIFICATIONS_DEFAULT, nil];
+}
+
 @end