Changeset 459

Timestamp:

Jun 24, 2006, 6:28:50 PM (17 years ago)

Author:

livings124

Message:

Getting closer to a perfected queue.

Location:

trunk/macosx

Files:

• Controller.m (modified) (3 diffs)
• English.lproj/PrefsWindow.nib/info.nib (modified) (2 diffs)
• English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)

trunk/macosx/Controller.m

@@ -579 +579 @@
         deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteTorrent
 {
+    //don't want any of these starting then stopping
+    NSEnumerator * enumerator = [torrents objectEnumerator];
     Torrent * torrent;
-    NSEnumerator * enumerator = [torrents objectEnumerator];
+    while ((torrent = [enumerator nextObject]))
+        [torrent setWaitToStart: NO];
+
+    NSNumber * lowestOrderValue = [NSNumber numberWithInt: [torrents count]], * currentOrederValue;
+
+    enumerator = [torrents objectEnumerator];
     while ((torrent = [enumerator nextObject]))
     {
@@ -589 +596 @@
         if (deleteTorrent)
             [torrent trashTorrent];
+        
+        //determine lowest order value
+        currentOrederValue = [torrent orderValue];
+        if ([lowestOrderValue compare: currentOrederValue] == NSOrderedDescending)
+            lowestOrderValue = currentOrederValue;
 
         [torrent removeForever];
@@ -594 +606 @@
     }
     [torrents release];
+
+    //reset the order values if necessary
+    if ([lowestOrderValue intValue] < [fTorrents count])
+    {
+        NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey:
+                                                @"orderValue" ascending: YES] autorelease];
+        NSArray * descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
+
+        NSArray * tempTorrents = [fTorrents sortedArrayUsingDescriptors: descriptors];
+        [descriptors release];
+
+        int i;
+        for (i = [lowestOrderValue intValue]; i < [tempTorrents count]; i++)
+            [[tempTorrents objectAtIndex: i] setOrderValue: i];
+    }
     
     [self torrentNumberChanged];

trunk/macosx/English.lproj/PrefsWindow.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>28</key>
-                <string>321 472 535 212 0 0 1152 842 </string>
+                <string>308 472 535 212 0 0 1152 842 </string>
                 <key>41</key>
                 <string>308 405 535 345 0 0 1152 842 </string>
@@ -19 +19 @@
         <array>
                 <integer>41</integer>
+                <integer>28</integer>
         </array>
         <key>IBSystem Version</key>