Changeset 394 for trunk/macosx/Controller.m

Timestamp:

Jun 19, 2006, 11:07:28 PM (16 years ago)

Author:

livings124

Message:

A little cleanup, a slightly more straight-forward way of checking the Growl path, and the method to register Growl won't be called through Interface Builder.

File:

• trunk/macosx/Controller.m (modified) (14 diffs)

trunk/macosx/Controller.m

@@ -65 +65 @@
         fInfoController = [[InfoWindowController alloc] initWithWindowNibName: @"InfoWindow"];
         fPrefsController = [[PrefsController alloc] initWithWindowNibName: @"PrefsWindow"];
+        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];
     }
     return self;
@@ -140 +147 @@
     }
     else
-        NSLog( @"Could not IORegisterForSystemPower" );
+        NSLog(@"Could not IORegisterForSystemPower");
 
     //load torrents from history
@@ -168 +175 @@
         currentSortItem = fDateSortItem;
     [currentSortItem setState: NSOnState];
-
-    //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: [[NSString stringWithFormat: @"~%@",
-                GROWL_PATH] stringByExpandingTildeInPath]];
-    [self growlRegister: self];
-
-    //initialize badging
-    fBadger = [[Badger alloc] init];
     
     //set upload limit action button
@@ -234 +231 @@
     [fWindow makeKeyAndOrderFront: nil];
 
-    [fInfoController updateInfoForTorrents: [self torrentsAtIndexes:
-                                    [fTableView selectedRowIndexes]]];
+    [fInfoController updateInfoForTorrents: [self torrentsAtIndexes: [fTableView selectedRowIndexes]]];
     if ([fDefaults boolForKey: @"InfoVisible"])
         [self showInfo: nil];
@@ -279 +275 @@
 
 - (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode
-                        contextInfo: (void *) contextInfo
+    contextInfo: (void *) contextInfo
 {
     [NSApp stopModal];
@@ -416 +412 @@
     int count = [fTorrents count];
     [fTotalTorrentsField setStringValue: [NSString stringWithFormat:
-                    @"%d Transfer%s", count, count == 1 ? "" : "s"]];
+        @"%d Transfer%s", count, count == 1 ? "" : "s"]];
 }
 
@@ -667 +663 @@
         NSSavePanel * panel = [NSSavePanel savePanel];
         [panel setRequiredFileType: @"torrent"];
+        [panel setCanSelectHiddenExtension: NO];
         [panel setExtensionHidden: NO];
-        [panel setCanSelectHiddenExtension: NO];
         
         [panel beginSheetForDirectory: nil file: [torrent name]
@@ -872 +868 @@
 {
     [fPrefsController setLimitEnabled: (sender == fUploadLimitItem || sender == fDownloadLimitItem)
-                        type: (sender == fUploadLimitItem || sender == fUploadNoLimitItem)
-                            ? @"Upload" : @"Download"];
+        type: (sender == fUploadLimitItem || sender == fUploadNoLimitItem) ? @"Upload" : @"Download"];
 }
 
@@ -971 +966 @@
     if (![[pasteboard types] containsObject: NSFilenamesPboardType]
             || [[[pasteboard propertyListForType: NSFilenamesPboardType]
-                pathsMatchingExtensions: [NSArray arrayWithObject: @"torrent"]]
-                count] == 0)
+        pathsMatchingExtensions: [NSArray arrayWithObject: @"torrent"]] count] == 0)
         return NSDragOperationNone;
 
@@ -1346 +1340 @@
 }
 
-- (void) sleepCallBack: (natural_t) messageType argument:
-                          (void *) messageArgument
+- (void) sleepCallBack: (natural_t) messageType argument: (void *) messageArgument
 {
     NSEnumerator * enumerator;
@@ -1400 +1393 @@
 }
 
-- (NSRect) windowWillUseStandardFrame: (NSWindow *) w
-    defaultFrame: (NSRect) defaultFrame
+- (NSRect) windowWillUseStandardFrame: (NSWindow *) w defaultFrame: (NSRect) defaultFrame
 {
     NSRect windowRect = [fWindow frame];
@@ -1439 +1431 @@
 - (void) notifyGrowl: (NSString * ) file
 {
-    NSString * growlScript;
-    NSAppleScript * appleScript;
-    NSDictionary * error;
-
-    if( !fHasGrowl )
+    if (!fHasGrowl)
         return;
 
-    growlScript = [NSString stringWithFormat:
+    NSString * growlScript = [NSString stringWithFormat:
         @"tell application \"System Events\"\n"
          "  if exists application process \"GrowlHelperApp\" then\n"
@@ -1457 +1445 @@
          "  end if\n"
          "end tell", file];
-    appleScript = [[NSAppleScript alloc] initWithSource: growlScript];
-    if( ![appleScript executeAndReturnError: &error] )
-    {
-        NSLog( @"Growl notify failed" );
-    }
+    
+    NSAppleScript * appleScript = [[NSAppleScript alloc] initWithSource: growlScript];
+    NSDictionary * error;
+    if (![appleScript executeAndReturnError: &error])
+        NSLog(@"Growl notify failed");
     [appleScript release];
 }
 
-- (void) growlRegister: (id) sender
-{
-    NSString * growlScript;
-    NSAppleScript * appleScript;
-    NSDictionary * error;
-
-    if( !fHasGrowl )
+- (void) growlRegister
+{
+    if (!fHasGrowl)
         return;
 
-    growlScript = [NSString stringWithFormat:
+    NSString * growlScript = [NSString stringWithFormat:
         @"tell application \"System Events\"\n"
          "  if exists application process \"GrowlHelperApp\" then\n"
@@ -1486 +1470 @@
          "end tell"];
 
-    appleScript = [[NSAppleScript alloc] initWithSource: growlScript];
-    if( ![appleScript executeAndReturnError: &error] )
-    {
-        NSLog( @"Growl registration failed" );
-    }
+    NSAppleScript * appleScript = [[NSAppleScript alloc] initWithSource: growlScript];
+    NSDictionary * error;
+    if (![appleScript executeAndReturnError: &error])
+        NSLog(@"Growl registration failed");
     [appleScript release];
 }