Changeset 2266

Timestamp:

Jul 1, 2007, 1:27:26 PM (15 years ago)

Author:

livings124

Message:

a little code cleanup

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• CreatorWindowController.m (modified) (2 diffs)
• DragOverlayWindow.h (modified) (1 diff)
• DragOverlayWindow.m (modified) (2 diffs)
• Torrent.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -546 +546 @@
     }
     
-    //save history and stop running torrents
+    //save history
     [self updateTorrentHistory];
     
-    //make sure torrent is closed
+    //make sure torrents are closed
     enumerator = [fTorrents objectEnumerator];
     Torrent * torrent;

trunk/macosx/CreatorWindowController.m

@@ -64 +64 @@
         if (fInfo->fileCount == 0)
         {
-            NSAlert * alert = [[[NSAlert alloc] init] autorelease];
+            NSAlert * alert = [[NSAlert alloc] init];
             [alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> no files -> button")];
             [alert setMessageText: NSLocalizedString(@"This folder contains no files.",
@@ -73 +73 @@
             
             [alert runModal];
+            [alert release];
             
             [self release];

trunk/macosx/DragOverlayWindow.h

@@ -39 +39 @@
 - (void) setURL: (NSString *) url;
 
+- (void) fadeIn;
 - (void) fadeOut;
 

trunk/macosx/DragOverlayWindow.m

@@ -126 +126 @@
     }
     
-    [[self contentView] setOverlay: icon mainLine: name subLine: secondString];
-    
-    //stop other animation and set to same progress
-    if ([fFadeOutAnimation isAnimating])
-    {
-        [fFadeOutAnimation stopAnimation];
-        [fFadeInAnimation setCurrentProgress: 1.0 - [fFadeOutAnimation currentProgress]];
-    }
-    [self setFrame: [[self parentWindow] frame] display: YES];
-    [fFadeInAnimation startAnimation];
+    [self fadeIn];
 }
 
 - (void) setFile: (NSString *) file
 {
-        
     [[self contentView] setOverlay: [NSImage imageNamed: @"CreateLarge.png"]
         mainLine: NSLocalizedString(@"Create a Torrent File", "Drag overlay -> file") subLine: file];
     
-    //stop other animation and set to same progress
-    if ([fFadeOutAnimation isAnimating])
-    {
-        [fFadeOutAnimation stopAnimation];
-        [fFadeInAnimation setCurrentProgress: 1.0 - [fFadeOutAnimation currentProgress]];
-    }
-    [self setFrame: [[self parentWindow] frame] display: YES];
-    [fFadeInAnimation startAnimation];
+    [self fadeIn];
 }
 
@@ -160 +143 @@
         mainLine: NSLocalizedString(@"Web Address", "Drag overlay -> url") subLine: url];
     
+    [self fadeIn];
+}
+
+- (void) fadeIn
+{
     //stop other animation and set to same progress
     if ([fFadeOutAnimation isAnimating])

trunk/macosx/Torrent.m

@@ -193 +193 @@
 - (void) dealloc
 {
-    # warning cleanup
+    #warning cleanup
     if (fHandle)
     {