Changeset 7802

Timestamp:

Jan 26, 2009, 2:16:03 AM (12 years ago)

Author:

livings124

Message:

random cleanup and update the strings file

Location:

trunk/macosx

Files:

• Controller.m (modified) (4 diffs)
• FileOutlineController.m (modified) (1 diff)
• MessageWindowController.m (modified) (2 diffs)
• en.lproj/Localizable.strings (modified) (1 diff)

trunk/macosx/Controller.m

@@ -348 +348 @@
     {
         if ((history = [fDefaults arrayForKey: @"History"]))
+        {
             [history retain];
-        [fDefaults removeObjectForKey: @"History"];
+            [fDefaults removeObjectForKey: @"History"];
+        }
     }
     
@@ -1783 +1785 @@
 {
     NSString * sortType = [fDefaults stringForKey: @"Sort"];
-    const BOOL asc = ![fDefaults boolForKey: @"SortReverse"];
-    
-    NSSortDescriptor * nameDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"name" ascending: asc
-                                            selector: @selector(compareFinder:)] autorelease];
-    
-    NSArray * descriptors = nil;
-    if ([sortType isEqualToString: SORT_NAME])
-        descriptors = [[NSArray alloc] initWithObjects: nameDescriptor, nil];
-    else if ([sortType isEqualToString: SORT_STATE])
-    {
-        NSSortDescriptor * stateDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"stateSortKey" ascending: !asc] autorelease],
-                        * progressDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"progress" ascending: !asc] autorelease],
-                        * ratioDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"ratio" ascending: !asc] autorelease];
-        
-        descriptors = [[NSArray alloc] initWithObjects: stateDescriptor, progressDescriptor, ratioDescriptor,
-                                                            nameDescriptor, nil];
-    }
-    else if ([sortType isEqualToString: SORT_PROGRESS])
-    {
-        NSSortDescriptor * progressDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"progress" ascending: asc] autorelease],
-                        * ratioProgressDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"progressStopRatio"
-                                                        ascending: asc] autorelease],
-                        * ratioDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"ratio" ascending: asc] autorelease];
-        
-        descriptors = [[NSArray alloc] initWithObjects: progressDescriptor, ratioProgressDescriptor, ratioDescriptor,
-                                                            nameDescriptor, nil];
-    }
-    else if ([sortType isEqualToString: SORT_TRACKER])
-    {
-        NSSortDescriptor * trackerDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"trackerAddressAnnounce" ascending: asc
-                                                selector: @selector(localizedCaseInsensitiveCompare:)] autorelease];
-        
-        descriptors = [[NSArray alloc] initWithObjects: trackerDescriptor, nameDescriptor, nil];
-    }
-    else if ([sortType isEqualToString: SORT_ACTIVITY])
-    {
-        NSSortDescriptor * rateDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"totalRate" ascending: !asc] autorelease];
-        NSSortDescriptor * activityDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"dateActivityOrAdd" ascending: !asc]
-                                                    autorelease];
-        
-        descriptors = [[NSArray alloc] initWithObjects: rateDescriptor, activityDescriptor, nameDescriptor, nil];
-    }
-    else if ([sortType isEqualToString: SORT_DATE])
-    {
-        NSSortDescriptor * dateDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"dateAdded" ascending: asc] autorelease];
-    
-        descriptors = [[NSArray alloc] initWithObjects: dateDescriptor, nameDescriptor, nil];
-    }
-    else; //no need to sort by queue order
-    
-    //actually sort
-    if (descriptors)
-    {
+    
+    if (![sortType isEqualToString: SORT_ORDER])
+    {
+        const BOOL asc = ![fDefaults boolForKey: @"SortReverse"];
+        
+        NSArray * descriptors;
+        NSSortDescriptor * nameDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"name" ascending: asc
+                                                selector: @selector(compareFinder:)] autorelease];
+        
+        if ([sortType isEqualToString: SORT_STATE])
+        {
+            NSSortDescriptor * stateDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"stateSortKey" ascending: !asc] autorelease],
+                            * progressDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"progress" ascending: !asc] autorelease],
+                            * ratioDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"ratio" ascending: !asc] autorelease];
+            
+            descriptors = [[NSArray alloc] initWithObjects: stateDescriptor, progressDescriptor, ratioDescriptor,
+                                                                nameDescriptor, nil];
+        }
+        else if ([sortType isEqualToString: SORT_PROGRESS])
+        {
+            NSSortDescriptor * progressDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"progress" ascending: asc] autorelease],
+                            * ratioProgressDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"progressStopRatio"
+                                                            ascending: asc] autorelease],
+                            * ratioDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"ratio" ascending: asc] autorelease];
+            
+            descriptors = [[NSArray alloc] initWithObjects: progressDescriptor, ratioProgressDescriptor, ratioDescriptor,
+                                                                nameDescriptor, nil];
+        }
+        else if ([sortType isEqualToString: SORT_TRACKER])
+        {
+            NSSortDescriptor * trackerDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"trackerAddressAnnounce" ascending: asc
+                                                    selector: @selector(localizedCaseInsensitiveCompare:)] autorelease];
+            
+            descriptors = [[NSArray alloc] initWithObjects: trackerDescriptor, nameDescriptor, nil];
+        }
+        else if ([sortType isEqualToString: SORT_ACTIVITY])
+        {
+            NSSortDescriptor * rateDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"totalRate" ascending: !asc] autorelease];
+            NSSortDescriptor * activityDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"dateActivityOrAdd" ascending: !asc]
+                                                        autorelease];
+            
+            descriptors = [[NSArray alloc] initWithObjects: rateDescriptor, activityDescriptor, nameDescriptor, nil];
+        }
+        else if ([sortType isEqualToString: SORT_DATE])
+        {
+            NSSortDescriptor * dateDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"dateAdded" ascending: asc] autorelease];
+        
+            descriptors = [[NSArray alloc] initWithObjects: dateDescriptor, nameDescriptor, nil];
+        }
+        else
+            descriptors = [[NSArray alloc] initWithObjects: nameDescriptor, nil];
+        
+        //actually sort
         if ([fDefaults boolForKey: @"SortByGroup"])
         {
@@ -1866 +1868 @@
     NSArray * selectedValues = [fTableView selectedValues];
     
-    NSInteger active = 0, downloading = 0, seeding = 0, paused = 0;
+    NSUInteger active = 0, downloading = 0, seeding = 0, paused = 0;
     NSString * filterType = [fDefaults stringForKey: @"Filter"];
     BOOL filterActive = NO, filterDownload = NO, filterSeed = NO, filterPause = NO, filterStatus = YES;
@@ -1880 +1882 @@
         filterStatus = NO;
     
-    NSInteger groupFilterValue = [fDefaults integerForKey: @"FilterGroup"];
-    BOOL filterGroup = groupFilterValue != GROUP_FILTER_ALL_TAG;
+    const NSInteger groupFilterValue = [fDefaults integerForKey: @"FilterGroup"];
+    const BOOL filterGroup = groupFilterValue != GROUP_FILTER_ALL_TAG;
     
     NSString * searchString = [fSearchFilterField stringValue];
-    BOOL filterText = [searchString length] > 0,
-        filterTracker = filterText && [[fDefaults stringForKey: @"FilterSearchType"] isEqualToString: FILTER_TYPE_TRACKER];
+    const BOOL filterText = [searchString length] > 0,
+            filterTracker = filterText && [[fDefaults stringForKey: @"FilterSearchType"] isEqualToString: FILTER_TYPE_TRACKER];
     
     NSMutableArray * allTorrents = [NSMutableArray arrayWithCapacity: [fTorrents count]];

trunk/macosx/FileOutlineController.m

@@ -30 +30 @@
 #import "QuickLookController.h"
 
-#define ROW_SMALL_HEIGHT 18.0f
+#define ROW_SMALL_HEIGHT 18.0
 
 typedef enum

trunk/macosx/MessageWindowController.m

@@ -159 +159 @@
                                     [NSString stringWithUTF8String: currentMessage->message], @"Message",
                                     [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
-                                    [NSNumber numberWithUnsignedInt: fIndex], @"Index", //more accurate when sorting by date
+                                    [NSNumber numberWithUnsignedInt: fIndex++], @"Index", //more accurate when sorting by date
                                     [NSNumber numberWithInt: currentMessage->level], @"Level",
                                     name, @"Name",
@@ -166 +166 @@
                                 
         [fMessages addObject: message];
-        fIndex++;
     }
     

trunk/macosx/en.lproj/Localizable.strings

@@ -155 +155 @@
 /* Groups -> Button */
 "All Groups" = "All Groups";
+
+/* Create torrent -> failed -> warning */
+"An unknown error has occurred." = "An unknown error has occurred.";
 
 /* All toolbar item -> label */