Changeset 389 for trunk/macosx/Controller.m

Timestamp:

Jun 18, 2006, 3:40:11 AM (16 years ago)

Author:

livings124

Message:

cleanup

File:

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

trunk/macosx/Controller.m

@@ -41 +41 @@
 #define TOOLBAR_RESUME_SELECTED @"Toolbar Resume Selected"
 
-#define WEBSITE_URL         @"http://transmission.m0k.org/"
-#define FORUM_URL           @"http://transmission.m0k.org/forum/"
-#define VERSION_PLIST_URL   @"http://transmission.m0k.org/version.plist"
+#define WEBSITE_URL @"http://transmission.m0k.org/"
+#define FORUM_URL   @"http://transmission.m0k.org/forum/"
 
 #define GROWL_PATH  @"/Library/PreferencePanes/Growl.prefPane/Contents/Resources/GrowlHelperApp.app"
@@ -265 +264 @@
                 ? @"There is an active transfer. Do you really want to quit?"
                 : [NSString stringWithFormat:
-                    @"There are %d active transfers. Do you really want to quit?",
-                    active];
+                    @"There are %d active transfers. Do you really want to quit?", active];
 
             NSBeginAlertSheet(@"Confirm Quit",
@@ -347 +345 @@
     BOOL autoStart = [fDefaults boolForKey: @"AutoStartDownload"];
     
-    NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"],
-            * torrentPath;
+    NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"], * torrentPath;
     Torrent * torrent;
     NSEnumerator * enumerator = [filenames objectEnumerator];
@@ -381 +378 @@
         {
             NSString * folder = [downloadChoice isEqualToString: @"Constant"]
-                                ? [[fDefaults stringForKey: @"DownloadFolder"]
-                                        stringByExpandingTildeInPath]
-                                : [torrentPath stringByDeletingLastPathComponent];
+                ? [[fDefaults stringForKey: @"DownloadFolder"] stringByExpandingTildeInPath]
+                : [torrentPath stringByDeletingLastPathComponent];
 
             [torrent setDownloadFolder: folder];
@@ -571 +567 @@
     }
     else
-    {
-        [self confirmRemove: torrents
-            deleteData: deleteData deleteTorrent: deleteTorrent];
-    }
+        [self confirmRemove: torrents deleteData: deleteData deleteTorrent: deleteTorrent];
 }
 
@@ -588 +581 @@
     
     if (returnCode == NSAlertDefaultReturn)
-    {
-        [self confirmRemove: torrents
-            deleteData: deleteData deleteTorrent: deleteTorrent];
-    }
+        [self confirmRemove: torrents deleteData: deleteData deleteTorrent: deleteTorrent];
     else
         [torrents release];
@@ -1414 +1404 @@
 {
     NSRect windowRect = [fWindow frame];
-    int count = [fTorrents count];
     float newHeight = windowRect.size.height - [fScrollView frame].size.height
-            + count * ([fTableView rowHeight] + [fTableView intercellSpacing].height) + 30.0;
+        + [fTorrents count] * ([fTableView rowHeight] + [fTableView intercellSpacing].height) + 30.0;
 
     float minHeight = [fWindow minSize].height;